Merge branch 'detection' of /home/skycom/Workspace/web-toolkit with conflicts.
KG|PM: moved 'getting started' into 'how to' button