insert & update moved  to QuerySet
Moved to new version of dx [2]
New layout implemented + bootstrap-notifications
Merged with remote
Merge branch 'layout'

Conflicts:
	static/js/script.js