latest
Merge branch 'master' of https://github.com/navyon/AffectiveAgent

Conflicts:
	Demo.v11.suo