+build_time in Buildingtype
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	db/schema.rb
Merge branch 'master' of https://github.com/Datenbankpraktikum2013/MMOG
Merge branch 'master' of https://github.com/Datenbankpraktikum2013/MMOG
*fix getDistance()
Merge branch 'master' of https://github.com/Datenbankpraktikum2013/MMOG

Conflicts:
	db/schema.rb