..
Merge branch 'master' of https://github.com/sklani16/WSPnew-JUly-2014

Conflicts:
	favorites.html
	myplace.html