table styles, university list view, society list view
conflicts resolved
new files pulled
conflicts resolved after merge

Conflicts:
	wp-content/themes/euc/_dashboard_includes/templates/organizations/organizations.list.template.php
	wp-content/themes/euc/_dashboard_includes/templates/organizations/universities.list.template.php
	wp-content/themes/euc/dashboard/dev/js/organizations/organizations.entity.js
	wp-content/themes/euc/dashboard/dev/js/organizations/organizations.list/list.view.js
	wp-content/themes/euc/dashboard/dev/js/organizations/universities/list/list.view.js
	wp-content/themes/euc/dashboard/dev/js/organizations/universities/single/single.ctrl.js
	wp-content/themes/euc/dashboard/dev/js/stashes/edit/edit.ctrl.js
conflicts resolved

Conflicts:
	wp-content/themes/euc/dashboard/dev/js/organizations/organizations.app.js
	wp-content/themes/euc/dashboard/dev/js/organizations/organizations.entity.js
	wp-content/themes/euc/dashboard/dev/js/organizations/universities/list/universities.list.view.js