Admin Part updated
Admin part updated
admin part
Update
Merge branch 'master' of https://github.com/AsheshMJoshi/MovieTicketing into Ashesh

Conflicts:
	.idea/workspace.xml
	application/config/config.php
	assets/image/icon.png
Merge branch 'Ashesh' of https://github.com/AsheshMJoshi/MovieTicketing

Conflicts:
	.idea/workspace.xml