Working on autosearch and project checkboxes
Merge branch 'master' into search

Conflicts:
	templates/template.html
Merge fix
Starting django add
Merge branch 'docs' into search
Adding unix project
Move import of javascript to templates
Just a start
Changed order of parsing and removed JS tags.
Merge branch 'feature/remove_js_tags' into feature/css_import

Conflicts:
	mindex.py
CSS combining works
Merge branch 'feature/css_import' into develop
Added basic arg parsing.
Added url support
Merge branch 'docs' into develop
Merge branch 'develop' into search
Merge branch 'develop' into feature/hyperlinks
Added optional URL as well as some robustness checks.
Merge branch 'feature/hyperlinks' into develop
Changed all "item" references to "entry"