add flotr2/finance
Merge remote-tracking branch 'origin/mydev' into mydev

Conflicts:
	app/templates/chatup/coins/finance_charts.html