Merge branch 'develop'
ignore .DS_Store files
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
cleanup
clean merge
fix issue 452
Merge branch 'master' into develop