Merge pull request #1 from sizzly/dev

Dev to Master
Merge pull request #2 from sizzly/master

Stable
Merge pull request #3 from sizzly/test

Stable.20141120
Fixed bug32
Merge branch 'hotfix.32.v1.0.1' into dev

Conflicts:
	php_errors.log