login hotfix
console log cleanup
Retrieve cards from server
Merge remote-tracking branch 'origin/master' into front

Conflicts:
	mrfogg-front/app/views/container.html