Adding bootstrap template interation
Merge branch 'develop'

Conflicts:
	tradingcenter/__init__.pyc
	tradingcenter/models/users.pyc
	tradingcenter/views.pyc
Adding main template
Fixing conflicts
Merge branch 'develop'

Conflicts:
	tradingcenter/__init__.pyc
	tradingcenter/models/__init__.pyc
	tradingcenter/models/users.pyc
	tradingcenter/views.pyc