Change project structure
Merge branch 'master' of github.com:skhokhlov/gewefope

Conflicts:
	src/js/library.js