initial update
Merge branch 'master' of github.com:manilacoders/devcup2014 into teacher-registration
Merge branch 'master' of github.com:manilacoders/devcup2014 into teacher-registration
more updates
Merge branch 'master' of github.com:manilacoders/devcup2014 into teacher-registration
Merge branch 'master' of github.com:manilacoders/devcup2014 into teacher-registration
more updates to questions
Merge branch 'master' of github.com:manilacoders/devcup2014 into teacher-registration
Merge branch 'ui'
Fixed merged conflict
Merge branch 'master' into ui
Constant for Question type
remove log directory from being git monitored
updates
Update database config
added dashboard
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