Merge branch 'develop'
Committing a working version of ruby on rails to master copy. Plain default RoR.
Merge remote-tracking branch 'origin' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Changed database to use strokeColor+StrokeWidth for database columns (path database).