test007

test007
Merge branch 'master' of https://github.com/lghpierre/smartGitTest

Conflicts:
	SmellMe/HNAppDelegate.h