Changed Authors-Meta, TODO-CHanges
Merge branch 'master' of https://github.com/founderio/taam.git

Conflicts:
	TODO