add active model serializers and start implementing android api controller
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop
start implementing search for android api controller
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop
add android article api methods
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop
load comments of, give comment for and search articles implemented
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop
start implementing cart api controller functions
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop

Conflicts:
	Gemfile.lock
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop
implement cart api functions for android
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop
implement android api controller
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop
use detailed search for android api
change search results for android api
Merge branch 'develop' of https://github.com/DanielMSchmidt/vergleichsportal into develop

Conflicts:
	config/routes.rb
advanced search looks correctly for existing search queries now