Merge pull request #25 from Luobata/master

no message
no message
Merge pull request #26 from Luobata/master

no message
no message
Merge pull request #27 from Luobata/master

no message
no message
Merge pull request #28 from Luobata/master

no message
no message
no message
no message
Merge remote-tracking branch 'Nicexm/master'

Conflicts:
	catalog/view/theme/default/template/common/footer.tpl
	forum/view/footer.htm