local commit
classpath commit
Merge branch 'masterMerge' of https://github.com/simpleclicks/Thunderbolts-Repo into masterMerge

Conflicts:
	classes/poke/resources/DocumentResource.class