added buildpath to git for easier switching between branches
Merge branch 'dev'