img
img fixMerge branch 'master' of https://github.com/amolc/redcardconnect

Conflicts:
	www/js/controllers.js