Added git version info, fixed bug with building
Merge branches 'dev' and 'master'
Changed git tag
Merge branches 'dev' and 'master'