creta evenet header sample
test
mc
conf solved
Merge branch 'master' of https://github.com/amolc/yoopmemobile

Conflicts:
	www/templates/friend-detail.html
	www/templates/tab-friends.html
Merge branch 'master' of https://github.com/amolc/yoopmemobile