db
& config
Unwanted files
New Architecture
Improvements
Merge branch 'master' into better
accordion and form
Merge branch 'master' of https://github.com/arshadansari27/fitranginew

Conflicts:
	app/templates/generic/includes/facets_add.html
	app/templates/generic/main/facets.html
	app/templates/model/content/editor.html
	app/templates/model/event/editor.html
Updates
fixes for facets
settings.py
facets.json
logo in title
Merge branch 'master' of https://github.com/arshadansari27/fitranginew
slider new pics
Fixes
Merge branch 'master' of https://github.com/arshadansari27/fitranginew

Conflicts:
	app/config.py
New Changes
minor fix
home page fixes
Home page fixes done