liemnh
Merge branch 'OCC-liemnh'

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	protected/views/layouts/main.php
Merge branch 'master' of https://github.com/bedonkey/occ

Conflicts:
	.settings/org.eclipse.core.resources.prefs