Revert "Moved main app into diary dir"

This reverts commit 20d8912507935d7b795718684af637e3ec6bcf5a.
Update to latest JAMJS packages
Apache rules to redirect traffic back to index