Merge branch 'hotfix/2.1.2'
Merge branch 'release/2.2.0'
displaying the sw version at the footer
started backup functionality
corrections
dynamic backup
Merge branch 'develop' into hotfix/2.2.1
Merge branch 'feature/database_mgt' into hotfix/2.2.1

Conflicts:
	.gitignore
Merge branch 'feature/data_corrections' into hotfix/2.2.1
backup test functionality testing
Merge branch 'hotfix/2.2.1' into develop
git ignore
git ignore
dashboard ui
more dashboard ui work.
fixed user_filter reset problem
added font-awesome
height on charts
Merge branch 'feature/ui' into feature/charts

Conflicts:
	application/modules/home/controllers/home.php
charts