Rearrange folders and files
Merge branch 'master' of https://github.com/jasminen/JaTz.git

Conflicts:
	JaTz/src/view/Game2048View.java
Merge branch 'master' of https://github.com/jasminen/JaTz.git

Conflicts:
	JaTz/src/model/game2048/MoveDown2048Action.java
	JaTz/src/model/game2048/MoveLeft2048Action.java
	JaTz/src/model/game2048/MoveRight2048Action.java
	JaTz/src/model/game2048/MoveUp2048Action.java
	JaTz/src/view/game2048/Game2048View.java
Finally fixing merge issues