merge changes
conflicts fixed
cleat
panel tabs done
Merge branch 'development' into feature/ajax_interaction
deshboard
Merge branch 'development' into feature/ajax_interaction
still working on AJAX calls and data.