added register formular
added error handling
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/logs/apache.log