Merge branch 'master' into andrey
test file upload donegit statusgit status
other tests for figure service
test file upload donegit statusgit status
other tests for figure service
Merge branch 'master' of github.com:asobolev/GCA-Web
other tests for figure service
Merge branch 'master' of github.com:asobolev/GCA-Web
Merge branch 'master' into andrey
moved RESTResults into GCA auth
Merge pull request #74 from asobolev/master

tests for Figure controller

LGTM
Merge branch 'master' into andrey
[model] util: Add new DateTimeConverter helper

Convert from org.joda.time.DateTime attribute to
java.sql.Timestamp
[jpa] add orm.xml with converter specs for DateTimeConverter
[model] Conference: +{start, end, deadline, logo, thumbnail }

Add new fields to conference
[service] Conference: order list/listOwn by startDate
Merge pull request #76 from gicmo/ConferenceModelChanges

Conference: +{start, end, deadline, logo, thumbnail } fields
Merge pull request #75 from asobolev/master

Moved RESTResults to GCAAuth for compliance

OK
models.js: add position to models
editor: some improvements