issue: https://github.com/cityindex/labs.cityindex.com/issues/100
Merge branch 'dev'

Conflicts:
	application/modules/AutoFlow_API.class.php