Merge branch 'master' of https://github.com/fareh/sise

Conflicts:
	src/Sise/Bundle/CoreBundle/Resources/config/routing.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Sise/Bundle/CoreBundle/Resources/config/routing.yml
Merge branch 'master' of https://github.com/fareh/sise
Merge branch 'master' of https://github.com/fareh/sise

Conflicts:
	src/Sise/Bundle/CoreBundle/Resources/config/routing.yml
Merge remote-tracking branch 'origin/master'