Merge branch 'master' of C:\wamp\www\service with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/security.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/security.yml