Changed latest to remain in place.
Merge branch 'master' of github.com:timbrandin/apk

Conflicts:
	client/client.js