Massive code style enhancement done by phpStorm.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	application/views/program/index.php