resources now working
Merge branch 'master' of https://github.com/tomaash/trackr

Conflicts:
	Gruntfile.js
M:N relationship