initial commit teamX - Ari
commit before pull
Merge branch 'master' of bitbucket.org:arirushan/espek
tuntutan bayaran pdf file not completed yet
Hard code user profile, so view can be seen by client
Merge branch 'master' of github.com:syafik/espekrails3
tuntutan bayaran pdf completed
error fix for missing template when no record found in carian pemohon, error fix for update course information, and fix error for daftar masuk asrama when tiada senarai
Merge branch 'master' of ssh://bitbucket.org/arirushan/espek into team-2
- Modify rake task to create user Roles
- Add menu and submenu of kewangan

TODO:
- link the menu to the proper view
Merge branch 'master' of github.com:syafik/espekrails3

Conflicts:
	app/controllers/course_applications_controller.rb
	app/controllers/course_implementations_controller.rb
	app/views/course_applications/all.html.erb
	app/views/course_implementations/_form.html.erb
	app/views/course_implementations/edit.html.erb
	app/views/user/register.html.erb
	lib/login_engine.rb
route for update course information back to put methode
Merge branch 'master' of github.com:syafik/espekrails3