minor changes
Merge branch 'master' of https://github.com/javier-lerones-gallego/Backpack

Conflicts:
	app/js/backpack.js
	app/js/backpack.js.map