Fixed Karma tests
Merge branch 'master' of github.com:sendwithus/resources

Conflicts:
	app/views/main.html