updates
Merge branch 'master' of https://github.com/nicknut/Timber

Conflicts:
	Setting/RootViewController.h
	Setting/RootViewController.m