Merging from ecthiender
Merge remote branch 'origin/master'
Fix title is undefined

  If title was not entered in the JSON, it would come up as undefined in
the page.
Fix json file to load. Loading example.json
Fix title undefined in content or page

  Looks like the fix was not pushed in the last commit which was
mentioned. Pushing the fix now.
All files mode change

  All files mode have changed and are in the unstaged area. Diff only
shows mode being changed, no content of any of the files were changed.
Adding all the files and commiting them.
Remove unwanted file

  Removed mainmaraafinal.json from the repo.
Change mode
  Files had changed permissions. Fixed them back.
Moving to a backend

  Using a server-side component in Mouchak to handle edits and user management
and revision management.
Client side is still the main web framework. The server-side component is to
aid in help and facilitate the client side.
Using flask and mongodb on the backend.
Editor in place

  Add visual interface for editing the website. Using timymce wysiwyg editor
for editing html.
Also, moving to ObjectIds of Mongo to use in models.
And, M.type_map is now called M.types
Navigation Menu changes and CSS fix

- Nav menu is a seperate component now which can be customized. By default it
  does not support sub-menus or dropdowns. But the user can write her own
bootstrap nav component. Support for adding custom menu has to be added.
- CSS for the editor is a seperate file now so that website's main css is not
  used in the editor.
Add new menu config and Fix many bugs

  - Add a configuration system for writing customized navigation menus. The
user has total flexibility to incorporate any kind of menus. Write any HTML
and CSS you want.
  - Fix many bugs in adding new pages and rendering them.
  - Fix the backend API. Its more meaningful now.
Fix few bugs

  - After new page was created in the editor, its view was dangling - it could
    not be reached. Fix that.
  - When page was refreshed, framework was taking it to home page irrespective
    of the URL hash. Fixed.
Fix bug while loading page without a hash URL

-  When default domain was loaded without hash URL, the framework did not
   navigate to the default first page. Fix that.
Simplified configuration file

  Using a simplified version of configuration file. No need to parse config
files anymore. Just store the as strings in a python file.
Fix typo

  Horrible mistake of not typing the correct variable names.
Small fixes. Still custom menu doesn't work.

  - small fixes in the UI code.
  - lot of logging to debug custom menu
Merge branch 'dev' of git.pantoto.org:mouchak/mouchak into development
Bug fixes:
  - Closing ticket #5 http://trac.pantoto.org/mouchak/ticket/5.
	- Custom menu interface was not checking if the option for custom menu was checked or not.  Fixing that.
	- Adding virtualenv entries in .gitignore
Merge branch 'dev' of git.pantoto.org:mouchak/mouchak into dev