Merge branch 'master' into tristan_finance_SQL
small fix in sql finance
Merge branch 'master' into tristan_finance_SQL
Merge branch 'master' into tristan_finance_SQL
adding text class to sql finalce
Merge branch 'master' into tristan_finance_SQL
dumb warn instead of warning causing unknown content_type
Merge branch 'master' into tristan_finance_SQL
adding more color to sql finance
Merge branch 'master' into tristan_old_proj_ui_update
Merge pull request #739 from teamleada/tristan_old_proj_ui_update

Tristan old proj ui update
Merge branch 'master' into tristan-master
removing guang from seed
Merge branch 'master' into tristan_finance_SQL
Merge branch 'tristan_finance_SQL' into tristan-master