Improve merging and bump versionCode while releasing #9

Merged bdonneaux merged 2 commits into DEVand:master from DEVand:devel on 21 Mar 2018

2018-03-21	59006ff Browse files » Improve merging in a method ... Signed-off-by: Benoit Donneaux <benoit.donneaux@digital-me.nl> Benoit Donneaux committed on 21 Mar 2018
2018-03-21	3a37d3a Browse files » Bump versionCode upon release rather than after ... Signed-off-by: Benoit Donneaux <benoit.donneaux@digital-me.nl> Benoit Donneaux committed on 21 Mar 2018