Some changes maybe
Merge branch 'master' of https://github.com/tompsoninc/copypaper

Conflicts:
	themes/default/css/main.css
	themes/default/css/main.min.css
	views/association/index.php
	views/contact-us/index.php
	views/header.php
	views/left-sidebar.php
	views/library/index.php
	views/user/index.php