nbproj
Merge branch 'master' of https://github.com/mcrisan/PlacesProject

Conflicts:
	nbproject/private/private.xml
first page events
Merge branch 'master' of https://github.com/mcrisan/PlacesProject