Update stuff
Merge branch 'master' into test

Conflicts:
	src/com/powerblock/timesheets/ExcelHandler.java