Fixed bower.json and env rake.
Merge remote-tracking branch 'origin/master'