active admin scaffold
Merge branch 'master' of github.com:maskrz/ZPI

Conflicts:
	app/assets/stylesheets/application.css.scss
Merge branch 'master' of github.com:maskrz/ZPI