missing folders.. grrr git
hashbang isn't used directly anymore.

needs further refactoring
Merge branch 'refs/heads/master' into examples/api