core: No code changes, just cleaning up and reformating according to Emacs Erlang mode before making actual changes
core: Fix: z_utils:get_path returns incorrect path to priv folder when Zotonic is released with reltool and loaded from an .ez archive file
mod_base: remove all zmodal masks when removing existing zmodals.
core: psql: better error message for insert/delete
mod_survey: Removed 2 obsolete templates
mod_survey: New question type "multiple choice"

The multiple choice option also has the option that the multiple
choice is a numeric value, in which case an overview of the total
value will be shown in the printable list and beneath the survey pie
chart. This is useful for creating forms which require you to enter an
amount or quantity, e.g. for a reservation system.

One drawback: choice values cannot currently be translated. But in
that case use the thurstone question type.

Also documented the survey question types somewhat.
core: give informational error when ua_classifier could not load during startup. Issue #496
mod_admin_identity: added #identity_verified{} notitication. Used to mark a verified identity to an user.
core: ensure resource ids passed to the ACL are integers. This makes ACL modules simpler.
Merge pull request #521 from yoonka/fix-app-paths

core: Fix app paths used in running Zotonic when starting from a release
build: moved mochiweb to it's own repository.
Use Rebar to manage and compile dependencies and optionally compile Zotonic
deps: new z_stdlib
mod_admin_predicate: Fix escaping of translated text in predicate help popup
mod_base: Log error in widgetmanager when evaluating the JSON data attribute fails
mod_base: Remove accidental console.log
doc: fix in docs for split_in and vsplit_in filters.
mod_development: Use z_utils instead of code module.
core: Use the path from code:lib_dir to find zotonic's lib_dir, otherwise use the old method. Fixes #529
Merge branch 'master' into yoonka-add-rebar-compatibility

Conflicts:
	deps/z_stdlib