design ready 70 %
check balance design ready
fix bugs
fix bugs 2
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	db/development.sqlite3