Merge pull request #10 from vircung/develop

Admin dashboard and actions mock
Merge pull request #11 from vircung/develop

Vies revisited
Error pages
Add pagination to system
Merge pull request #13 from sptq/feature/12-add-pagination

Add pagination to system
Merge branch 'sptq_develop' into feature/live-reload-fix

Conflicts:
	Gemfile
Merge pull request #16 from vircung/feature/live-reload-fix

Setup test and run environment
Merge pull request #18 from vircung/feature/test-database

Database for test and production fixes #17
Merge branch 'develop' of github.com:sptq/Vhagar into develop

Conflicts:
	app/controllers/admin/users_controller.rb
	app/views/admin/users/index.html