update gitignore/layout
Merge branch 'master' of github.com:soda-io/dubna-app

Conflicts:
	template/layout.swig