#171 Started refactor of function folder
Merge branch '2.0' into builder

Conflicts:
	inc/config.php
	index.php
#163 Refactored parts folder structure
Merge branch 'builder' into 2.0
Merge branch '2.0' of https://github.com/bigspring/monolith into 2.0

Conflicts:
	inc/functions.php