URBNG-66 Login and authorization - Small fix for e-mail sending instead of writing it in a console.
Merge pull request #165 from angieo/web

URBNG-66 Login and authorization - Small fix for e-mail sending instead ...
Added 4 example tasks to game gid=1.

Changes:
* added some tasks
* added some forgotten fields to server responces
* added geodistance function again
* other smaller changes
Merge branch 'web' of https://github.com/blstream/UrbanGame into web

Conflicts:
	database/urbangame.h2.db
	database/urbangameApi.h2.db
Merge pull request #166 from mkaim/web

URBNG-35: Added 4 example tasks to game 1
Fix of sending GPS answer.
Fixing number of points when GPS task answer is rejected.
Merge pull request #167 from mkaim/web

URBNG-35: Little fix of sending gps task answer
Because there are few changes and I need this modification ASAP, I will merge my own pull-request.
URBNG-70 Create new game - visual changes in Summary step

URBNG-68 My games view - modifications in managing the game caused some changes in this view - game management is now part of this view, started games details are loaded by clicking the table row or edit button. It gives the opportunity to see all game info in one view.

URBNG-69 Select game for editing:
 - ended games are not editable
 - editing started and planned games differs from each other - projects and published games are edited similar to creating new game, online games will be edited in place (only allowed properties) in 'Game info' view (edit online games is in progress)
 - only authenticated operators can edit their games

URBNG-72 Edit existing game - visual preparations
Merge remote-tracking branch 'blstream.origin/web' into web
Merge pull request #168 from angieo/web

[Web] URBNG-70, URBNG-68, URBNG-69, URBNG-72
URBNG-77
Merge remote-tracking branch 'upstream/web' into web

Conflicts:
	database/urbangame.h2.db
	database/urbangameApi.h2.db
	target/scala-2.10/resource_managed/main/public/javascripts/controllers/newGameCtrl.min.js