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
Merge pull request #13 from sureshvtt/master

Fixed the bug with test taking
Added option for editing tips and tricks and fix bugs in read and learn in tutor app
Added option for publish, unpublish and edit option in publisher app
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/__init__.pyc
	pscexams/admin/admin.pyc
	pscexams/admin/models.pyc
	pscexams/settings.pyc
	pscexams/static/__init__.pyc
	pscexams/static/admin.pyc
	pscexams/static/models.pyc
	pscexams/student/admin.pyc
	pscexams/student/models.pyc
	pscexams/tutor/admin.pyc
	pscexams/tutor/views.pyc
	pscexams/urls.pyc
	pscexams/user_type.pyc
	pscexams/views.pyc
	pscexams/wsgi.pyc
Merge pull request #14 from gopikamohanv/master

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 yutor app.
Included performance chart in students account
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/admin/admin.pyc
	pscexams/settings.pyc
	pscexams/static/admin.pyc
	pscexams/student/admin.pyc
	pscexams/student/models.pyc
	pscexams/tutor/admin.pyc
	pscexams/tutor/views.pyc
	pscexams/urls.pyc
	pscexams/views.pyc
Option to view the syllabus of the exams for the visitors.
Added option to view the syllabus of exams for the visitors.
Merge branch 'master' of https://github.com/redrosevishnu/pscexams

Conflicts:
	pscexams/__init__.pyc
	pscexams/admin/admin.pyc
	pscexams/admin/models.pyc
	pscexams/settings.pyc
	pscexams/static/__init__.pyc
	pscexams/static/admin.pyc
	pscexams/static/models.pyc
	pscexams/student/admin.pyc
	pscexams/student/models.pyc
	pscexams/tutor/admin.pyc
	pscexams/tutor/views.pyc
	pscexams/urls.pyc
	pscexams/user_type.pyc
	pscexams/views.pyc
	pscexams/wsgi.pyc
Merge pull request #15 from Meghaasok/master

Added option to view the syllabus of exams for the visitors.
Added google analytics in tutor, publisher and admin pages
Merge branch 'master' of https://github.com/redrosevishnu/pscexams
Make changes in home page of admin
Merge branch 'master' of https://github.com/redrosevishnu/pscexams
Make changes in home page of admin part
Merge pull request #16 from swathymohanan/master

Make changes in home page of admin
No change
Merge branch 'master' of https://github.com/redrosevishnu/pscexams
Model exam created in student profile
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/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