Edited first view, bug fixes, show places on map(beta)
Merge remote-tracking branch 'origin/master'