checks increment total sum
bugs fix
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	db/development.sqlite3