harris 11/12/14
Merge branch 'master' of https://github.com/anggarasaja/prototype

Conflicts:
	cms/view/input_atlet.php