[resolved issues SAT-274, SAT-282, SAT-296, SAT-297, SAT-298]
[newly added files]
[resolved issue SAT-277 and some modification]
[resolved issues SAT-275, SAT-280, SAT-278, SAT-279, SAT-281, SAT-283]
[resolved issue SAT-290]
Merge branch 'master' of https://github.com/b-change/satudunia

Conflicts:
	app/assets/stylesheets/plus/style.css
	app/views/questions/index.html.haml
Merge pull request #5 from viveksh/master

new pull request for sprint 28 SAT-275, SAT-276, SAT-277, SAT-278 , SAT-279, SAT-280, SAT-281, SAT-282, SAT-283, SAT-286, SAT-287, SAT-290, SAT-296,SAT-297,SAT-298, SAT-308