add admin and users management
Merge commit 'e80574e7e954ebc55cf4b31ca07f341979e6eafa' into develop

Conflicts:
	db/schema.rb
Merge commit '13cc892391391e542b34462a43827a14e6133a0f' into develop
modify views