Merge branch 'master' of github.com:manilacoders/devcup2014 into daison-updates
updates
push my updates
Merge branch 'master' of github.com:manilacoders/devcup2014 into daison-updates
Add logout action
more updates on reports
Merge branch 'master' of github.com:manilacoders/devcup2014 into daison-updates
finalized the reports
new migration - Relation of Section and Subjects
Student can now show the subject
Merge branch 'ui'
Merge branch 'daison-updates'
updates the dashboard header
Merge branch 'daison-updates'
fixed conflict
Merge branch 'master' into ui

Conflicts:
	apps/frontend/templates/_dashboard_header.php
	data/sql/schema.sql