Merge branch 'master' into develop
bower.json line sorting
rearranged due to vars naming changed
some inline docu
Merge branch 'develop'
bumped version number