frontend integrated
frontend integrated and working
remove old settings.py file and fix development.py db settings
Directory structure simplified
Database password reverted
Merge branch 'master' into prototype

Conflicts:
	.idea/.name
	.idea/bazaar.iml
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/vcs.xml
	.idea/workspace.xml
	Bmodels/admin.py
	Bmodels/login_api.py
	Bmodels/models.py
	Bmodels/tests.py
	Bmodels/views.py
	bazaar/Bmodels/login_api.py
	bazaar/Bmodels/tests.py
	bazaar/api/tests.py
	bazaar/bazaar/settings.py
	bazaar/shop/login_api.py
	bazaar/urls.py