mozilla
Merge branch 'master' of https://github.com/do-or-do/skeleton

Conflicts:
	public/js/app/controllers/ApplicationController.js