dereck
Merge branch 'master' of https://github.com/dereckleme/siteBouts

Conflicts:
	module/Base/view/error/index.phtml
Merge branch 'master' of https://github.com/dereckleme/siteBouts
Merge branch 'master' of https://github.com/dereckleme/siteBouts
Merge branch 'master' of https://github.com/dereckleme/siteBouts
Att Paulo