merge changes
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
merge changes
adding reference tables
merge changes
Merge branch 'master' of https://github.com/kelvinmbwilo/RSMSA

Conflicts:
	.idea/workspace.xml
	app/routes.php
	app/views/dashboard.blade.php
	app/views/layout/header.blade.php
	app/views/layout/left_menu.blade.php
	app/views/layout/master.blade.php
	public/assets/bootstrap-datetimepicker/js/bootstrap-datetimepicker.js
	public/assets/ckeditor/ckeditor.js
	public/assets/font-awesome/css/font-awesome.css
merge changes