Merge branch 'master' of github.com:sams/BakingPlate

Conflicts:
	Config/submodules.php

Small bug fix with paginator plus

Cleaned up configuration file

Adding back standard asset loading (commented out)

Fixed some duplication and organization of the layouts

Removed icon from gitignore because it was ignoring icon files/folders

merged commit #2 from ProLoser; into v0.1a