fixed tests
Some testing stuff
Merge branch 'master' of github.com:sendwithus/resources

Conflicts:
	app/scripts/app.coffee