deleted:    ../lib/__init__.py
	deleted:    ../lib/oneid.py
	deleted:    Admin.txt
	deleted:    Blog.txt
	deleted:    Calendar.txt
	deleted:    Files.txt
	deleted:    MainPage.txt
	deleted:    Tasks.txt
	deleted:    Workspace.txt
Generic layout templates for intranet
Generic layout/base templates, static css/js/img routes
Merge branch 'Intranet_Registration' of https://github.com/speleato/Cuore-Web-page into Intranet_Registration

Conflicts:
	cuorewebpage/lib/oneid.py