Merge branch 'development' of github.com:liloi/umklaidet into development
Add: Tileset model;
Add: Colors to man view
Merge branch 'detailed-map-view' into development
ADD: Zend Framework
Merge remote-tracking branch 'origin/development'
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md