Merge branch 'develop'
Fix a team bugs
Merge branch 'master' into develop
Integrate maven and bower