commit resolving conflicts
Merge branch 'master' of https://github.com/baabte/baabtraServices
commit with conflict fix by arun

Conflicts:
	Djproject/urls.pyc
	myapp/menuRelatedView.pyc