created index of users and older index only when json is asked
edit user index
start form new user
user form
fix space
single quote
Merge branch 'master' into user_management

Conflicts:
	app/models/user.rb
Merge branch 'master' of https://github.com/ivaldi/brimir into user_management

Conflicts:
	app/views/layouts/application.html.erb
fix newline :cop:
fix 2.1.1 travis version
Merge pull request #55 from basschoen/user_management

User management