admin view modified
Coding
Ajax done
Merge branch 'develop'

Conflicts:
	assets/js/site.min.js