map
Merge branch 'master' of https://github.com/Jacky311/BlackBerryApp-RBCNGI

Conflicts:
	googlemap.html
	index.html