Revert "Merge branch 'Feature/Hidde' into Feature/Rizki"

This reverts commit 9a58a60be9c8362ba0ef2b08c7c38f1372ead038.

Conflicts:
	Infradox/Infradox/ViewController.m