heroku test
edit for heroku
Merge branch 'master' of github.com:zzzccc/RCMS

Conflicts:
	app/views/documents/_form.html.haml
	app/views/documents/_show.html.haml
	app/views/kaminari/_paginator.html.haml