Prepare to go online
Merge branch 'master' of github.com:petria/hokan_ng