Merge pull request #1 from CruGlobal/master

Update fork with upstream master.
Update style of error page to 2014.
Merge pull request #15 from elikem/master

Update style of error page to 2014