no trigger create
Merge branch 'mikkel' into andreas
minor changes
ready for fetching google maps api
Merge branch 'andreas' into mikkel