backlog
Added some comments
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git
leaflet map
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git into menzs2
build fix
Changes in DBUser and Import-sql
Merge branch 'master' of
https://github.com/svennyffenegger/ch.bfh.bti7081.s2013.cyan.git into
menzs2

Conflicts:
	TeamCyan/.classpath