Changes
Merge branch 'master' of github.com:jpercent/foneem

Conflicts:
	foneem/template/register1.html
Merge branch 'master' of github.com:jpercent/foneem