Added fake placeholder

Signed-off-by: Luigi Parpinel <luigi.parpinel@subito.it>
Merge branch 'master' of https://github.com/viteinfinite/UIKonfHackDay2014

Signed-off-by: Luigi Parpinel <luigi.parpinel@subito.it>

Conflicts:
	UIKonfHackDay.xcodeproj/project.pbxproj