bower and L&F details
Merge branch 'master' of https://github.com/elmarto/buymagic

Conflicts:
public/js/controllers.js
Merge branch 'master' of https://github.com/elmarto/buymagic