Merge branch 'master' of https://github.com/kaveh82/prizerunner.git

Conflicts:
	prizerunner-server/cakephp/app/View/User/login.ctp
modified pages..