testing travis
Merge branch 'dev' of https://github.com/applyance/client into dev