Merge remote-tracking branch 'upstream/master'
fixed wording in businessmodel section
Merge pull request #212 from AJRenold/master

fixed a few wordings in businessmodel section
merged upstream
merged upstream
some edits
Merge branch 'review-Thomas'
Merge branch 'master' of https://github.com/sbenthall/i290m-ocpp-site

Conflicts:
	report/bib/references.bib
Merge pull request #213 from tomnar/master

Assignment 6 + 7
fixed latex syntax error
getting rid of toc file
survey_design.tex updated
Merge pull request #214 from capetroz/master

survey_design.tex updated
changes to joining section
Update discussionOverview.tex
Merge pull request #215 from prabhamatta/master

changes to joining section
Combined discussion section
Update 060_discussion.tex
Added more figures from the survey to substantiate the points mentioned in the report
Merge pull request #216 from prabhamatta/master

Added more figures from the survey to substantiate the points mentioned ...