code clearing
code clearing
[ID 360] update login wireframe
Merge remote-tracking branch 'origin/Dani'

Conflicts:
	source/dictionary-base/src/main/java/org/ultimate/dictionary/model/AssociationJSONWrapper.java
	source/dictionary-base/src/main/java/org/ultimate/dictionary/model/DictionaryJSONWrapper.java
	source/dictionary-base/src/main/java/org/ultimate/dictionary/model/GroupJSONWrapper.java
	source/dictionary-base/src/main/java/org/ultimate/dictionary/model/JSONWrapper.java
	source/dictionary-base/src/main/java/org/ultimate/dictionary/model/ListJSONWrapper.java
	source/dictionary-base/src/main/java/org/ultimate/dictionary/model/UserJSONWrapper.java
	source/dictionary-base/src/main/java/org/ultimate/dictionary/model/WordJSONWrapper.java
	source/dictionary-base/src/test/java/org/ultimate/dictionary/model/json/AssociationJSONWrapperTest.java
	source/dictionary-base/src/test/java/org/ultimate/dictionary/model/json/DictionaryJSONWrapperTest.java
	source/dictionary-base/src/test/java/org/ultimate/dictionary/model/json/GroupJSONWrapperTest.java
	source/dictionary-base/src/test/java/org/ultimate/dictionary/model/json/JSONWrapperTest.java
	source/dictionary-base/src/test/java/org/ultimate/dictionary/model/json/ListJSONWrapperTest.java
	source/dictionary-base/src/test/java/org/ultimate/dictionary/model/json/UserJSONWrapperTest.java
	source/dictionary-base/src/test/java/org/ultimate/dictionary/model/json/WordJSONWrapperTest.java