client/server functionnal + ticker working
Merge branch 'master' of github.com:gnicod/aion

Conflicts:
	aion