Prototype Developing [2]
Merge branch 'master' of https://github.com/lethanhtungbk/entity-system-management

Conflicts:
	app/views/components/button-bar.blade.php
	app/views/page/page-body.blade.php
	app/views/page/page-footer.blade.php
	app/views/page/page-head.blade.php
	app/views/page/page-index.blade.php