Starting developing new feature for photos upload
Created service Uploader
Installed Ratchet php library with basic chat
Installed Ratchet ZeroMq library
Using parameters.yml for image upload client id.
Working image upload as service
Merge branch 'feature-upload-photo' into develop

Conflicts:
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/css/font-awesome.css
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/css/font-awesome.min.css
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/fonts/FontAwesome.otf
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/fonts/fontawesome-webfont.eot
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/fonts/fontawesome-webfont.svg
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/fonts/fontawesome-webfont.ttf
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/fonts/fontawesome-webfont.woff
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/bordered-pulled.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/core.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/fixed-width.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/font-awesome.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/icons.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/larger.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/list.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/mixins.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/path.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/rotated-flipped.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/spinning.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/stacked.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/less/variables.less
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_bordered-pulled.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_core.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_fixed-width.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_icons.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_larger.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_list.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_mixins.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_path.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_rotated-flipped.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_spinning.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_stacked.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/_variables.scss
	src/Audero/BackendBundle/Resources/public/font-awesome-4.1.0/scss/font-awesome.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/css/font-awesome.css
	src/Audero/BackendBundle/Resources/public/font-awesome/css/font-awesome.min.css
	src/Audero/BackendBundle/Resources/public/font-awesome/fonts/FontAwesome.otf
	src/Audero/BackendBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.eot
	src/Audero/BackendBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.svg
	src/Audero/BackendBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.ttf
	src/Audero/BackendBundle/Resources/public/font-awesome/fonts/fontawesome-webfont.woff
	src/Audero/BackendBundle/Resources/public/font-awesome/less/bordered-pulled.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/core.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/fixed-width.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/font-awesome.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/icons.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/larger.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/list.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/mixins.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/path.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/rotated-flipped.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/spinning.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/stacked.less
	src/Audero/BackendBundle/Resources/public/font-awesome/less/variables.less
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_bordered-pulled.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_core.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_fixed-width.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_icons.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_larger.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_list.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_mixins.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_path.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_rotated-flipped.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_spinning.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_stacked.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/_variables.scss
	src/Audero/BackendBundle/Resources/public/font-awesome/scss/font-awesome.scss
	web/font-awesome-4.1.0/css/font-awesome.css
	web/font-awesome-4.1.0/css/font-awesome.min.css
	web/font-awesome-4.1.0/fonts/FontAwesome.otf
	web/font-awesome-4.1.0/fonts/fontawesome-webfont.eot
	web/font-awesome-4.1.0/fonts/fontawesome-webfont.svg
	web/font-awesome-4.1.0/fonts/fontawesome-webfont.ttf
	web/font-awesome-4.1.0/fonts/fontawesome-webfont.woff
	web/font-awesome-4.1.0/less/bordered-pulled.less
	web/font-awesome-4.1.0/less/core.less
	web/font-awesome-4.1.0/less/fixed-width.less
	web/font-awesome-4.1.0/less/font-awesome.less
	web/font-awesome-4.1.0/less/icons.less
	web/font-awesome-4.1.0/less/larger.less
	web/font-awesome-4.1.0/less/list.less
	web/font-awesome-4.1.0/less/mixins.less
	web/font-awesome-4.1.0/less/path.less
	web/font-awesome-4.1.0/less/rotated-flipped.less
	web/font-awesome-4.1.0/less/spinning.less
	web/font-awesome-4.1.0/less/stacked.less
	web/font-awesome-4.1.0/less/variables.less
	web/font-awesome-4.1.0/scss/_bordered-pulled.scss
	web/font-awesome-4.1.0/scss/_core.scss
	web/font-awesome-4.1.0/scss/_fixed-width.scss
	web/font-awesome-4.1.0/scss/_icons.scss
	web/font-awesome-4.1.0/scss/_larger.scss
	web/font-awesome-4.1.0/scss/_list.scss
	web/font-awesome-4.1.0/scss/_mixins.scss
	web/font-awesome-4.1.0/scss/_path.scss
	web/font-awesome-4.1.0/scss/_rotated-flipped.scss
	web/font-awesome-4.1.0/scss/_spinning.scss
	web/font-awesome-4.1.0/scss/_stacked.scss
	web/font-awesome-4.1.0/scss/_variables.scss
	web/font-awesome-4.1.0/scss/font-awesome.scss
Merge branch 'develop' of github.com:nfqakademija/audero into feature-pusher

Conflicts:
	composer.lock
	src/Audero/WebBundle/Controller/MainController.php
	src/Audero/WebBundle/Resources/views/Main/index.html.twig
Changed default session handler to PDO
Created new services file
Configured pusher to work with uploader
Added .idea folder to .gitignore
Added PDO session parameters to parameters.yml.dist
Modified Showphoto bundle entities

Moved User entity from BackendBundle to ShowphotoBundle
Created new entities Chat and Wish
Renamed entities:
	Application -> PhotoRequest
	Interpretation -> PhotoResponse
	Judgement -> Rating
Added new services and entity

new services:
	upload.manager
	token.provider
new entity: Options (BackendBundle)
registered new service "upload.manager"
Moved Uploader folder to Services folder
Created game architecture
Created controller for feature Spectate
Added wishes management to profile page.