Merge remote-tracking branch 'origin/aaron'

Conflicts:
	aloja-web/inc/common.php
Merge remote-tracking branch 'origin/aaron'

Conflicts:
	aloja-web/inc/common.php
Shortened a word
Shortened a word
Bug fix on charts1