Merge pull request #23 from johns996/dev-eric

Dev eric
Merge pull request #24 from johns996/dev-eric

Dev eric
added upmedia style
tweaked new release styles
added c&m classes
Merge pull request #25 from johns996/master

Merging from master