changing views to view
Merge remote-tracking branch 'origin/master'

Conflicts:
	view/admin.html
changing views to view