Merge branch 'development'
area calc
bump
Merge branch 'master'