Update for Git Master
Event on client
Merge pull request #73 from litruk/patch-1

Fixed: Wrong events triggered in client/profile.php
Merge branch 'stable' into upstream-master

Conflicts:
	CHANGELOG
	configs/debian/imscp.conf
	configs/ubuntu/imscp.conf
	docs/Debian/INSTALL
	docs/Ubuntu/INSTALL
Updated 1.1.x CHANGELOG
Merge branch 'stable' into upstream-master

Conflicts:
	CHANGELOG
	docs/Debian/INSTALL
	docs/Ubuntu/INSTALL
Merging with stable
Merging with stable
Merge branch 'stable' into upstream-master

Conflicts:
	CHANGELOG
	configs/debian/imscp.conf
	configs/ubuntu/imscp.conf
Merge branch 'stable' into upstream-master

Conflicts:
	CHANGELOG
Updated 1.1.x CHANGELOG
Merge branch 'stable' into upstream-master
Merge branch 'stable' into upstream-master
Merged stable into master
Merge branch 'stable' into upstream-master

Conflicts:
	CHANGELOG
Merged stable into master
Merge branch 'stable' into upstream-master

Conflicts:
	CHANGELOG
Merged stable into master
Merge branch 'stable' into upstream-master

Conflicts:
	CHANGELOG
Merge branch 'stable' into upstream-master

Conflicts:
	CHANGELOG