analplugg
Merge branch 'master' of https://github.com/IVProductions/Clicker

Conflicts:
	www/app/services/records.js