Added mergeTest v2 from eclipse
Merge branch 'master' of https://github.com/dmatocha/potayto.git

Conflicts:
	mergeTest20131002_v2