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

Conflicts:
	js/profile.js