added version
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
general change
changed through changes in the database structure
Merge branch 'develop'

Conflicts:
	application/models/bill_model.php