started integrating english translations
added collection_id to generator replacements
first version of english language file inserted
upgraded to angularjs 1.2.18
implements changing relationship properties without leaving the page
makes generators render via angularjs
switched icon for relationship property editing
fixes missing mongodb configuration
bumped version to 1.6.0
fixes #1385, #1033
adds possibility to switch locale for users
allow users to have a parent from which they inherit permissions
added first version of LDAP auth (not fully tested)
made all tests pass
fixes solr gitignore
Merge branches 'i18n_en' and 'ldap' into v1.7

Conflicts:
	config/locales/de/activerecord/application.yml
fixes external authentication (#748)
made user set permissions to the inherited value when equal to the parent
fixes passing username and password to auth scripts
username can only be composed of letters, numbers and underscores