merging changes
metging changes
merging changes
adding stakeholder interface
merging changes
merging changes
interface design
pulling after deleting the .eot file
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/advanced-datatable/media/css/demo_page.css
	public/assets/advanced-datatable/media/css/demo_table.css
	public/assets/advanced-datatable/media/images/back_disabled.png
	public/assets/advanced-datatable/media/images/back_enabled.png
	public/assets/advanced-datatable/media/images/back_enabled_hover.png
	public/assets/advanced-datatable/media/images/forward_disabled.png
	public/assets/advanced-datatable/media/images/forward_enabled.png
	public/assets/advanced-datatable/media/images/forward_enabled_hover.png
	public/assets/advanced-datatable/media/images/sort_asc.png
	public/assets/advanced-datatable/media/images/sort_asc_disabled.png
	public/assets/advanced-datatable/media/images/sort_both.png
	public/assets/advanced-datatable/media/images/sort_desc.png
	public/assets/advanced-datatable/media/images/sort_desc_disabled.png
	public/assets/advanced-datatable/media/js/jquery.dataTables.js
	public/assets/bootstrap-colorpicker/css/colorpicker.css
	public/assets/bootstrap-colorpicker/img/alpha.png
	public/assets/bootstrap-colorpicker/img/hue.png
	public/assets/bootstrap-colorpicker/img/saturation.png
	public/assets/bootstrap-colorpicker/js/bootstrap-colorpicker.js
	public/assets/bootstrap-datepicker/css/datepicker.css
	public/assets/bootstrap-datepicker/js/bootstrap-datepicker.js
	public/assets/bootstrap-daterangepicker/date.js
	public/assets/bootstrap-daterangepicker/daterangepicker-bs3.css
	public/assets/bootstrap-daterangepicker/daterangepicker.css
	public/assets/bootstrap-daterangepicker/daterangepicker.js
	public/assets/bootstrap-daterangepicker/moment.min.js
	public/assets/bootstrap-datetimepicker/css/datetimepicker.css
	public/assets/bootstrap-datetimepicker/js/bootstrap-datetimepicker.js
	public/assets/bootstrap-fileupload/bootstrap-fileupload.css
	public/assets/bootstrap-fileupload/bootstrap-fileupload.js
	public/assets/bootstrap-inputmask/bootstrap-inputmask.min.js
	public/assets/bootstrap-timepicker/compiled/timepicker.css
	public/assets/bootstrap-timepicker/js/bootstrap-timepicker.js
	public/assets/bootstrap-wysihtml5/bootstrap-wysihtml5.css
	public/assets/bootstrap-wysihtml5/bootstrap-wysihtml5.js
	public/assets/bootstrap-wysihtml5/wysihtml5-0.3.0.js
	public/assets/chart-master/Chart.js
	public/assets/ckeditor/ckeditor.js
	public/assets/data-tables/DT_bootstrap.css
	public/assets/data-tables/DT_bootstrap.js
	public/assets/data-tables/images/sort_asc.png
	public/assets/data-tables/images/sort_both.png
	public/assets/data-tables/images/sort_desc.png
	public/assets/data-tables/jquery.dataTables.js
	public/assets/dropzone/css/dropzone.css
	public/assets/dropzone/dropzone.js
	public/assets/dropzone/images/spritemap.png
	public/assets/dropzone/images/spritemap@2x.png
	public/assets/fancybox/source/blank.gif
	public/assets/fancybox/source/fancybox_loading.gif
	public/assets/fancybox/source/fancybox_overlay.png
	public/assets/fancybox/source/fancybox_sprite.png
	public/assets/fancybox/source/jquery.fancybox.css
	public/assets/fancybox/source/jquery.fancybox.js
	public/assets/file-uploader/css/jquery.fileupload-noscript.css
	public/assets/file-uploader/css/jquery.fileupload-ui-noscript.css
	public/assets/file-uploader/css/jquery.fileupload-ui.css
	public/assets/file-uploader/css/jquery.fileupload.css
	public/assets/file-uploader/img/loading.gif
	public/assets/file-uploader/img/progressbar.gif
	public/assets/file-uploader/js/jquery.fileupload-audio.js
	public/assets/file-uploader/js/jquery.fileupload-image.js
	public/assets/file-uploader/js/jquery.fileupload-process.js
	public/assets/file-uploader/js/jquery.fileupload-ui.js
	public/assets/file-uploader/js/jquery.fileupload-validate.js
	public/assets/file-uploader/js/jquery.fileupload-video.js
	public/assets/file-uploader/js/jquery.fileupload.js
	public/assets/file-uploader/js/jquery.iframe-transport.js
	public/assets/file-uploader/js/main.js
	public/assets/file-uploader/js/vendor/jquery.ui.widget.js
	public/assets/flot/jquery.flot.crosshair.js
	public/assets/flot/jquery.flot.js
	public/assets/flot/jquery.flot.pie.js
	public/assets/flot/jquery.flot.resize.js
	public/assets/flot/jquery.flot.stack.js
	public/assets/fuelux/css/tree-style.css
	public/assets/fuelux/img/tree-icons.png
	public/assets/fuelux/js/spinner.min.js
	public/assets/fuelux/js/tree.min.js
	public/assets/fullcalendar/fullcalendar/bootstrap-fullcalendar.css
	public/assets/fullcalendar/fullcalendar/fullcalendar.min.js
	public/assets/gritter/css/jquery.gritter.css
	public/assets/gritter/images/gritter-light.png
	public/assets/gritter/images/gritter.png
	public/assets/gritter/images/ie-spacer.gif
	public/assets/gritter/js/jquery.gritter.js
	public/assets/jcrop/css/Jcrop.gif
	public/assets/jcrop/css/jquery.Jcrop.min.css
	public/assets/jcrop/js/jquery.Jcrop.min.js
	public/assets/jcrop/js/jquery.color.js
	public/assets/jquery-easy-pie-chart/jquery.easy-pie-chart.css
	public/assets/jquery-easy-pie-chart/jquery.easy-pie-chart.js
	public/assets/jquery-file-upload/css/jquery.fileupload-ui.css
	public/assets/jquery-file-upload/img/loading.gif
	public/assets/jquery-file-upload/img/progressbar.gif
	public/assets/jquery-file-upload/js/jquery.fileupload-fp.js
	public/assets/jquery-file-upload/js/jquery.fileupload-ui.js
	public/assets/jquery-file-upload/js/jquery.fileupload.js
	public/assets/jquery-file-upload/js/jquery.iframe-transport.js
	public/assets/jquery-file-upload/js/vendor/canvas-to-blob.min.js
	public/assets/jquery-file-upload/js/vendor/jquery.ui.widget.js
	public/assets/jquery-file-upload/js/vendor/load-image.min.js
	public/assets/jquery-file-upload/js/vendor/tmpl.min.js
	public/assets/jquery-knob/js/jquery.knob.js
	public/assets/jquery-multi-select/css/multi-select.css
	public/assets/jquery-multi-select/img/switch.png
	public/assets/jquery-multi-select/js/jquery.multi-select.js
	public/assets/jquery-multi-select/js/jquery.quicksearch.js
	public/assets/jquery-ui/images/animated-overlay.gif
	public/assets/jquery-ui/images/ui-bg_diagonals-thick_18_b81900_40x40.png
	public/assets/jquery-ui/images/ui-bg_diagonals-thick_20_666666_40x40.png
	public/assets/jquery-ui/images/ui-bg_flat_10_000000_40x100.png
	public/assets/jquery-ui/images/ui-bg_glass_100_f6f6f6_1x400.png
	public/assets/jquery-ui/images/ui-bg_glass_100_fdf5ce_1x400.png
	public/assets/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png
	public/assets/jquery-ui/images/ui-bg_gloss-wave_35_f6a828_500x100.png
	public/assets/jquery-ui/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
	public/assets/jquery-ui/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
	public/assets/jquery-ui/images/ui-icons_222222_256x240.png
	public/assets/jquery-ui/images/ui-icons_228ef1_256x240.png
	public/assets/jquery-ui/images/ui-icons_ef8c08_256x240.png
	public/assets/jquery-ui/images/ui-icons_ffd27a_256x240.png
	public/assets/jquery-ui/images/ui-icons_ffffff_256x240.png
	public/assets/jquery-ui/jquery-ui-1.10.1.custom.min.css
	public/assets/jquery-ui/jquery-ui-1.10.1.custom.min.js
	public/assets/morris.js-0.4.3/morris.css
	public/assets/morris.js-0.4.3/morris.min.js
	public/assets/morris.js-0.4.3/raphael-min.js
	public/assets/nestable/jquery.nestable.css
	public/assets/nestable/jquery.nestable.js
	public/assets/xchart/d3.v3.min.js
	public/assets/xchart/xcharts.css
	public/assets/xchart/xcharts.min.js
	public/css/bootstrap-reset.css
	public/css/bootstrap.min.css
	public/css/gallery.css
	public/css/image-crop.css
	public/css/invoice-print.css
	public/css/owl.carousel.css
	public/css/slidebars.css
	public/css/soon.css
	public/css/style-responsive.css
	public/css/style.css
	public/css/table-responsive.css
	public/css/tasks.css
	public/fonts/glyphicons-halflings-regular.eot
	public/fonts/glyphicons-halflings-regular.svg
	public/fonts/glyphicons-halflings-regular.ttf.html
	public/fonts/glyphicons-halflings-regular.woff
	public/img/404_icon.png
	public/img/500_icon.png
	public/img/arrow-up.png
	public/img/avatar-mini.jpg
	public/img/avatar-mini2.jpg
	public/img/avatar-mini3.jpg
	public/img/avatar-mini4.jpg
	public/img/avatar1.jpg
	public/img/avatar1_small.jpg
	public/img/chart-texture.jpg
	public/img/chat-attach.jpg
	public/img/chat-avatar.jpg
	public/img/chat-avatar2.jpg
	public/img/chat-search.png
	public/img/checkbox/check-off.png
	public/img/checkbox/check-on.png
	public/img/checkbox/radio-off.png
	public/img/checkbox/radio-on.png
	public/img/customSelect-arrow.gif
	public/img/email-img/banner.jpg
	public/img/email-img/icon-cal.png
	public/img/email-img/icon-tel.png
	public/img/email-img/image1.png
	public/img/email-img/image2.png
	public/img/email-img/image3.png
	public/img/email-img/image4.png
	public/img/email-img/main-img.png
	public/img/email-img/social-facebook.png
	public/img/email-img/social-google.png
	public/img/email-img/social-linkedin.png
	public/img/email-img/social-twitter.png
	public/img/email-img/social-youtube.png
	public/img/email-img/vector-lab.jpg
	public/img/fb-img.jpg
	public/img/file-search/ai.png
	public/img/file-search/doc.png
	public/img/file-search/email.png
	public/img/file-search/eps.png
	public/img/file-search/jpg.png
	public/img/file-search/pdf.png
	public/img/file-search/ppt.png
	public/img/file-search/psd.png
	public/img/file-search/rss.png
	public/img/file-search/xls.png
	public/img/file-search/zip.png
	public/img/flags/de.png
	public/img/flags/es.png
	public/img/flags/fr.png
	public/img/flags/ru.png
	public/img/flags/us.png
	public/img/follower-avatar.jpg
	public/img/gallery/1.jpg
	public/img/gallery/2.jpg
	public/img/gallery/3.jpg
	public/img/gallery/4.jpg
	public/img/gallery/5.jpg
	public/img/gallery/6.jpg
	public/img/input-spinner.gif
	public/img/left-arrow.png
	public/img/lock-bg.jpg
	public/img/mail-avatar.jpg
	public/img/mask.png
	public/img/nav-expand.png
	public/img/photos/user1.png
	public/img/photos/user2.png
	public/img/photos/user3.png
	public/img/photos/user4.png
	public/img/photos/user5.png
	public/img/pro-ac-1.png
	public/img/pro-ac-2.png
	public/img/product-list/pro-1.jpg
	public/img/product-list/pro-thumb-1.jpg
	public/img/product-list/pro-thumb-2.jpg
	public/img/product-list/pro-thumb-3.jpg
	public/img/product-list/pro-thumb-big.jpg
	public/img/product-list/pro1.jpg
	public/img/product-list/pro2.jpg
	public/img/product-list/pro3.jpg
	public/img/product1.jpg
	public/img/product2.png
	public/img/product3.png
	public/img/profile-avatar.jpg
	public/img/right-arrow.png
	public/img/ring.jpg
	public/img/search-icon.jpg
	public/img/slider/1.jpg
	public/img/sm-img-1.jpg
	public/img/sm-img-2.jpg
	public/img/sm-img-3.jpg
	public/img/vector-lab.jpg
	public/js/advanced-form-components.js
	public/js/all-chartjs.js
	public/js/bootstrap-switch.js
	public/js/bootstrap.min.js
	public/js/common-scripts.js
	public/js/count.js
	public/js/draggable-portlet.js
	public/js/dynamic_table_init.js
	public/js/easy-pie-chart.js
	public/js/editable-table.js
	public/js/external-dragging-calendar.js
	public/js/flot-chart.js
	public/js/form-component.js
	public/js/form-image-crop.js
	public/js/form-validation-script.js
	public/js/ga.js
	public/js/gmaps-scripts.js
	public/js/gmaps.js
	public/js/gritter.js
	public/js/hover-dropdown.js
	public/js/jquery-migrate-1.2.1.min.js
	public/js/jquery-ui-1.9.2.custom.min.js
	public/js/jquery.customSelect.min.js
	public/js/jquery.dcjqaccordion.2.7.js
	public/js/jquery.js
	public/js/jquery.nicescroll.js
	public/js/jquery.pulsate.min.js
	public/js/jquery.scrollTo.min.js
	public/js/jquery.sparkline.js
	public/js/jquery.stepy.js
	public/js/jquery.tagsinput.js
	public/js/jquery.ui.touch-punch.min.js
	public/js/jquery.validate.min.js
	public/js/modernizr.custom.js
	public/js/morris-script.js
	public/js/nestable.js
	public/js/owl.carousel.js
	public/js/pulstate.js
	public/js/respond.min.js
	public/js/slidebars.min.js
	public/js/sliders.js
	public/js/soon/custom.js
	public/js/soon/plugins.js
	public/js/sparkline-chart.js
	public/js/tasks.js
	public/js/toucheffects.js
	public/js/tree.js