Added mergeTest20131002 from Eclipse
Merge branch 'master' of https://github.com/dmatocha/potayto

Conflicts:
	mergeTest20131002