Merge branch 'master' into run-bower-develop
Update bower to 1.2.7
Merge branch 'master' into run-bower-develop
Merge branch 'run-bower' into run-bower-develop