Merge branch 'develop'
Removed debug code
Updated Version Number
Added infinite scrolling to search
Added infinite scrolling image to repo
Added HTML and better CSS Compression. still investigating better JS compression tool
Compressed tracking
Updated compactor to not compress js
Added last modified headers
Removed testing cache stuff
Updated for caching
Merge branch 'master' of github.com:charlesportwoodii/CiiMS

Conflicts:
	protected/controllers/CategoriesController.php
Update protected/controllers/CategoriesController.php
Updated Caching
Updated caching
Merge branch 'm2'

Conflicts:
	protected/controllers/CategoriesController.php
Updated index
Removed displayvar
fixed typo
git commit fix