Merge branch 'master' of https://github.com/kiat-mao/shpost_examination into 4win03
Merge branch 'master' of https://github.com/kiat-mao/shpost_examination into 4win03
Merge branch '4win03' of https://github.com/kiat-mao/shpost_examination into 4win03

Conflicts:
	db/migrate/20131127221434_create_questions.rb
Merge branch '4win03' of https://github.com/kiat-mao/shpost_examination into 4win03

Conflicts:
	app/models/student_ability.rb
	app/views/students/_form.html.erb
	db/migrate/20131127221434_create_questions.rb