Data Entry
Merge branch 'master' of https://github.com/KevinMarete/ADVANTECH

Conflicts:
	application/modules/parameter/controllers/parameter.php
	application/modules/template/controllers/template.php
	application/modules/template/views/sidebar_view.php
Progress on Data Entry
Data Entry Module Complete
merged with abdala