Several mods

Signed-off-by: Artur Tenorio <arturvt@gmail.com>
Merge remote-tracking branch 'origin/ember_mod01'

Signed-off-by: Artur Tenorio <arturvt@gmail.com>

Conflicts:
	.idea/phpweb.iml
	php/.DS_Store