New changes
Merge branch 'mircea'
merge the changes and update on git
Merge branch 'master' of https://github.com/raulmacarie/templates

Conflicts:
	js/base.js
resolving conflicts
Moving ViewerJS into js/lib/ViewerJS
Restyling
Little changes