Delete paypal_adaptive.yml
Merge branch 'feature-libraries' into develop
fixed security issue in  app/views/comments/_index_paginated.js.erb
;

end
Merge branch 'develop'
Moved 'details' CSS from module to libraries controller specific stylesheet
Merge branch 'feature-libraries' into develop

Conflicts:
	app/assets/stylesheets/controller/libraries.css.scss
Fixed small layout bug in libraries popup
Disabled animation when closing news banner
Merge branch 'feature-libraries' into develop
Possible fix for login window position on smartphones
taking out asset server till problems with them fixed
library control panel refactoring, add basic inclusion symbol
library control panel i18n
replace strong params with arcane for comments
enabling asset hosts again
HOTFIX allow transport fees up to 500Euro as was specified
Merge branch 'master' into develop
Merge branch 'feature-libraries' into develop
fix mobile login problem with js instead of css
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop

Conflicts:
	app/assets/stylesheets/layout/_header.scss