Merge pull request #11 from gopikamohanv/master

Modified tipsandtricks model and template
Read&Learn and Trips&Tricks options were included in student account.
Option to find user details in admin part.
option to view user details in admin part.
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/templates/admin_header.html
	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
Merge pull request #12 from swathymohanan/master

Option to view user details in admin part
Included new questions and tips in student's dashboard
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/settings.pyc
Added option for edit, publish and unpublish in publisher app.
Also added option for edit tips and tricks and fix bugs on edit option of read and learn in tutor app.
Added option for edit, publish and unpublish in publisher app.

Also added option for edit tips and tricks and fix bugs on edit option of read
 read and learn in tutor app.

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

Conflicts:
	pscexams/admin/models.pyc
	pscexams/admin/views.py
	pscexams/tutor/views.pyc
	pscexams/urls.pyc
	pscexams/views.pyc