Bumped up version code
Merged conflicts
Merge branch 'dev'
Switched off debug flag
Merged
Merged conflicts
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'