Email
Merge branch 'develop' of https://github.com/MwangiKevin/lims into develop
Merge branch 'feature/alerts' of https://github.com/MwangiKevin/lims into develop
Merge branch 'develop' of https://github.com/MwangiKevin/lims into develop
Merge branch 'develop' of https://github.com/MwangiKevin/lims into develop
Merge branch 'develop' into feature/lab_dashboard

* develop:
  UI
  Reports
  a few more
  a small change
  more designs
  Started designing Lab reports.
  modified Reports Page
  Disabled Changing Themes. Plus rotating cog. Awesome!
  Added JQuery Tooltips to shortcuts
  unified Sidebar
  Reports download page
  email
  alerts ctd
  Started Reports
Reports Module
Get Email
Merge branch 'develop' of https://github.com/Shohiek/lims into develop
Merge branch 'develop' of https://github.com/bakasajoshua/lims into develop
Reports Module
Merge branch 'develop' of https://github.com/Shohiek/lims into develop

Conflicts:
	application/modules/alerts/controllers/email.php

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Just changes

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge branch 'feature/alerts' into develop
Merge branch 'feature/lab_dashboard' into develop
tat view

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
alerts email and automatic email functioning.

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
created find_in_json function

Signed-off-by: MwangiKevin <mwangikevinn@gmail.com>
Merge branch 'feature/json_cacheing' into feature/alerts