Register + SongList
Merge branch 'master' of https://github.com/Alonai/TralalaClient

Conflicts:
	src/controllers/MemberController.java
	src/controllers/PaymentController.java
	src/controllers/SongController.java