travis ci integration
class dir
Merge branch 'master' into feature/test-branches

* master:
  class dir
  travis ci integration

Conflicts:
	class/Api.php