Epic tableview is epics

haaaaay🙋 doei
Merge branch 'Feature/Hidde'
Merge branch 'Feature/Rizki'

Conflicts:
	Infradox/Infradox/IDMainViewController.m
Small commit
Merge branch 'master' into Feature/Rizki