Fix model and credit
Merge branch 'emberCli' of https://github.com/balanced/balanced-dashboard into emberCli

Conflicts:
	app/models/credit.js
FIx the rest of the models