tis 19 nov
Merge branch 'master' of https://github.com/nickenilsson/TomasPomas2

Conflicts:
	AtflickVersion2/AtflickVersion2/RootViewController.m