* Fix: location mark is shown for pois without location
Merge branch 'master' into hotfixes
Merge branch 'hotfixes'
Merge branch 'master' into presets
+ Added photo taking button
* specify jpeg as mime format in xml export for photos
* added some string resources for property window
+ Added camera button. Seems to close #2.
* fixed some bugs