packages
Merge branch 'master' of https://github.com/Rotten194/TJ-Hackathon-2013

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources