update gitignore
Merge remote-tracking branch 'upstream/develop' into develop
d3JS start
updates in d3js
Added Line chart, still some bugs
Changes before merge fluency.ses.ana.tools
Fluency score added
Merge fluency_ses_ana_tools branch, updated time series graph
Fluency axis, blue dot click, bug fixes, javascript improvements
in progress
develop.constiPersistencyIssue
 seems to be solved, but additional testing required.
Merge branch 'develop.fluency_time_series_graph' into develop

Conflicts:
	webApp/swift/src/main/scala/org/ocbkc/swift/global/Global.scala
Merge branch 'develop' into develop.fluencygame_exp_2014.07.03

Conflicts:
	webApp/swift/src/main/scala/org/ocbkc/swift/global/Global.scala