Added timber
Merge branch 'master' into development

Conflicts:
	lib/vendor/jarednova/timber-library
Re-added timber