Sync

There are several differences between your and my repo. Please pull to sync those changes. And best would be - BEFORE issuing a pull request - if you would pull once from _MY_  repo/branch. 

And please _DO_NOT_ git-add generated directories like build/, externalLibraries/, doc/ etc. They just clutter the repo history and produce conflict after conflict.

Thanks :)