added unfinished ui for landing and registration page
Merge branch 'master' into ui

Conflicts:
	log/frontend_dev.log
	web/frontend_dev.php
Merge branch 'ui'
Fixed merged conflict
Constant for Question type
remove log directory from being git monitored
Update database config
Email Confirmation
For confirmation
Merge branch 'login'
Merge branch 'tr2'

Conflicts:
	cache/frontend/dev/config/config_settings.yml.php
	cache/frontend/test/config/config_app.yml.php
	cache/frontend/test/config/config_config_handlers.yml.php
	cache/frontend/test/config/config_settings.yml.php
	log/frontend_dev.log
more updates
Merge branch 'master' of github.com:manilacoders/devcup2014 into tr2

Conflicts:
	log/frontend_dev.log
more updates