Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
bumped version number to v0.7.2
merged
Delete bower.json.BACKUP.7012.json
Delete bower.json.BASE.7012.json
Delete bower.json.LOCAL.7012.json
Delete bower.json.REMOTE.7012.json
Merge branch 'develop'
Merge branch 'develop'
bumped version
Merge branch 'master' into develop