commiting changes configuration and billing plans
committing changes billing and cinfigMerge branch 'master' of https://github.com/baabte/baabtraServices

Conflicts:
	Djproject/urls.py
	Djproject/urls.pyc
	myapp/companyJobView.pyc
	myapp/views.pyc