Merge branch 'master' of https://github.com/acacha/ebre-escool
temporary changes in inventory
Merge branch 'master' of https://github.com/acacha/ebre-escool

Conflicts:
	application/modules/inventory/controllers/inventory.php
Solved  Cannot redeclare inventory::$html_header_view in /usr/share/ebre-escool/application/modules/inventory/controllers/inventory.php
Multiple enhacements:
- At ebre_escool_html_header.php avoid including to times same JS: jquery give multiple problems if charged two times
- Ebre-escool use jquery min JS of Grocery Cruds: Include Jquery Migrate 1.2.1. Avoid problems with select2 and Grocery Crud at same page
- Only include defaultvalues_view.php when necessary. Not included in grocery crud list state
Now user if admin could select Organizational Unit or show all. If not admin then only could see objects of his own OU
Now users menu shows OK!
Solved preferences menu. Now Ok
Solved menu selected in managment section
Merge branch 'master' of https://github.com/acacha/ebre-escool
Filtres als informes d'inventari funcionant.