Cleared out checkpoint controller
Merge branch 'design-update'

* design-update:
  Formally switched over to FontAwesome 3.0. Some icons may break
Fixed Regexp
removed all admin references
Removed cancan
Removed remnant questionanswer stuff

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Merge branch 'master' of https://github.com/jethrokuan/ol2
Resolved Conflicts
Updated Staff stuff
Updated the redirect_to URLs for the GDrive import. This will change once the update page comes up

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Masking route for signing up
Fixed Expand and Close all for all (Y)
Precompiled assets
Flipped the middle finger at SASS (horrible preprocessor, I insist) and creation of the update page

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Added jquery
Added jquery
Merge branch 'master' of https://github.com/jethrokuan/ol2

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>

Conflicts:
	app/controllers/usr_controller.rb
	app/views/usr/staff.html.erb
Added back SASS
Removed SASS removed jquery_include_tag
Merge branch 'master' of https://github.com/jethrokuan/ol2