cleanup crap we dont need
Rails 4.1 fix
Use depend_on
Merge branch 'master' of github.com:monsterboxpro/monster-templates

Conflicts:
	app/controllers/monster_templating_controller.rb