tambahan edit
Merge branch 'master' of https://github.com/proginJAM/IF3038-2013

Conflicts:
	proginJAM/public_html/Dashboard.js