admin routes and hotel images add on category module
Merge branch 'master' of https://github.com/naveedaziz/Bda

Conflicts:
	assets/frontend/css/theme.css