merged Field and FieldGroup classes
Merge branch 'feature/fields_refactor' of github.com:globaleaks/GLBackend into feature/fields_refactor

Conflicts:
	docs/ng-fields-spec.md
	globaleaks/handlers/admin/field.py
	globaleaks/models/__init__.py
	globaleaks/rest/requests.py
	globaleaks/tests/handlers/admin/test_admin.py
	globaleaks/tests/helpers.py
	globaleaks/tests/test_models.py
Add field serialization in /admin/fields put request.

Instead of returning {'result': 'ok'}, return a more appropriate summary of the
fields that have been modified as they do appear on the database after the
edit.
Remove the default argument language in controller functions for admin/fields.

For two reasons:
1. I want them to fail if I haven't provided a language argument from the
request.
2. At the moment they are never called with an implicit argument.
Making step number implicit.

* Implement in models new() for step so that number is no more required, and
  auto-increments itself (I found *NO* way to perform this in storm or sqlite
  keeping the same primary keys)
* Add unittests for those changes.
Dababase constranints for step table.

Strengthen validation of steps introducing more contraints.
Step creation with OPTIONAL number argument.

* Re-introduce now a possible step number to add a step in a prefixed position,
  which will automagically update all following steps.
* Add unittests for this new feature.
Add delete() function to step, caring the update of step numbers.

* Implement Step.delete()
* Add test_delete() to test_models.TestStep
* Fix abstract class "Model"'s delete method.
Creating draft for handlers in /admin/field/step.

* Creating a StepsCollection handler, without registering it to
  globaleaks.rest.api
* Add delete() callback for DELETE request, which will take care of multiple
  steps deletion.
* Unittest delete callback with a trivial test (still have to think about corner
  cases)
merged Field and FieldGroup classes
Strengthening unittests for /admin/field.
Use setuptools instead of distutils in setup.py.

Among the other things, developers are now allowed to install globaleaks into
develop mode with::
$ python setup.py develop
Happy hacking.
Optimize setup.py with trivial corrections.

* Use for line in file, not readlines(), unless you do want to read the whole
  file at once;
* Use listcomp, as we want to return a list, not a map object.
* Tune indentation.
bump to version 2.60.14
added import for localized templates from glclient appdata
addressed issue https://github.com/globaleaks/GlobaLeaks/issues/926
fixed a bug related to a bad merge
implemented support for https://github.com/globaleaks/GlobaLeaks/issues/949
x_frame_options now accepts confiogurations only for deny and allow-from modes
fixed some unit tests