Add func and Binary into models/base
Merge branch 'master' of github.com:longmaworks/tank

Conflicts:
	models/base.py