Merge
Revert "Merge"

This reverts commit 90fee8288540e290dea86b31946009bd2f26be00.
Adds files
Conflit fix.
Bug fix in User.java.