Fixed: php 5.4 does not use reference calling
Merge branch 'master' into production

Conflicts:
	.gitignore