List View filtering
Finalize SMR
Finalize SMRTimeCard BusinessUnit etc
ActivityType EventProtocol etc
bongga
Merge branch 'master' into merged ed branch

Conflicts:
	config.inc.php
	user_privileges/user_privileges_6.php
	user_privileges/user_privileges_8.php
	user_privileges/user_privileges_9.php