add statistics and links to student tenancy
Merge remote-tracking branch 'upstream/master'
Update SyntaxError in Events
Update en.yml in Events
update show page
Merge pull request #22 from raqibhakim/master

Update E Filing | Campus Events Index Page
Merge pull request #23 from rayguard/master

Close Dead links for Staff Info and Bulletin Board
Merge pull request #24 from diaarezz/master

update show page
cover all commit
master merge
Commit
Just Commit

Conflicts:
	app/views/cofiles/show.html.haml