Animation classes to mixing. Renaming file to new naming conventions.
Merge branch 'sitebuilder' of https://github.com/kevinsproles/pieology into sitebuilder

Conflicts resolved:
	app/scripts/directives/app-workspace.js
	app/scripts/services/vln-config.js