Merge branch 'develop' into HEAD
Merge branch 'develop'
Updated version in '''bower.js'''
Merge branch 'develop'
Bumped up bower version