Merge pull request #24 from gopikamohanv/master

Updation in student app and front page
Student's details in admin profile
Added forum
Updated user_registration_details to view the details of users on-click of loadmore.
Merge pull request #25 from Meghaasok/master

Updated user_registration_details to view the details of users on-click ...
Completed forum functionality
Added sms and email facility
Added favicon
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/__init__.pyc
	pscexams/admin/__init__.pyc
	pscexams/admin/admin.pyc
	pscexams/admin/models.pyc
	pscexams/admin/urls.py
	pscexams/admin/views.py
	pscexams/settings.pyc
	pscexams/static/__init__.pyc
	pscexams/static/admin.pyc
	pscexams/static/models.pyc
	pscexams/student/__init__.pyc
	pscexams/student/admin.pyc
	pscexams/student/models.pyc
	pscexams/tutor/__init__.pyc
	pscexams/tutor/admin.pyc
	pscexams/tutor/models.pyc
	pscexams/tutor/views.pyc
	pscexams/urls.pyc
	pscexams/user_type.pyc
	pscexams/views.pyc
	pscexams/wsgi.pyc
Fixed conflicts
Merge pull request #26 from sureshvtt/master

Completed forum functionality and added sms
Removed is staff check in forum views
Merge branch 'master' of https://github.com/redrosevishnu/pscexams
Merge pull request #27 from sureshvtt/master

Removed is staff check in forum views
Changed group study page titles
Created a new app currentaffairs and
models - CurrentAffair_Language, CurrentAffairs_topic, CurrentAffairs_Question, CurrentAffairs_OnewordQuestion.
Option for adding current affairs questions and read and learn part of current affairs in tutor app.
Option for adding current affairs topic in admin app.
Fixed sms
Merge pull request #28 from sureshvtt/master

Changed group study page titles
Created a new app currentaffairs and
models - CurrentAffair_Language, CurrentAffairs_topic, CurrentAffairs_Question, CurrentAffairs_OnewordQuestion.
Option for adding current affairs questions and read and learn part of current affairs in tutor app.
Option for adding current affairs topic in admin app.

Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/admin/models.pyc
	pscexams/admin/urls.py
	pscexams/admin/views.py
	pscexams/settings.py
	pscexams/settings.pyc
	pscexams/student/models.pyc
	pscexams/student/templates/base.html
	pscexams/tutor/views.pyc
	pscexams/urls.pyc
	pscexams/user_type.pyc
	pscexams/views.pyc
Merge branch 'master' of https://github.com/redrosevishnu/pscexams