ユーザ登録API連携実装中
Merge branch 'dev' into feature-1_2
エラー修正
fix conflicts
fix user registration
fix movie list view
fix login action
Merge pull request #16 from ScrumPBL/feature-1_2

ユーザ登録アクティビティ、映画リストアクティビティのAPI呼び出しを実装完了
implemented MovieListMenuButton4Listner
implementing
bug fix
Merge branch 'feature-11' into feature-13
Merge pull request #18 from ScrumPBL/feature-DOC-9

ユーザー情報更新API追加
implemented MovieListButton2Listner
changed favorite button label
ユーザ情報取得API追加
Merge branch 'feature-DOC-9' of https://github.com/ScrumPBL/team1 into feature-13
Merge branch 'dev' into feature-14

Conflicts:
	DocodemoMovie/src/jp/co/nttgroup/scrum/docomomo/logic/api/MovieServerAPI.java
	DocodemoMovieUT3/bin/classes/jp/co/nttgroup/scrum/docomomo/logic/api/MovieServerAPIImplTest.class
	DocodemoMovieUT3/src/jp/co/nttgroup/scrum/docomomo/logic/api/MovieServerAPIImplTest.java
implementing
fix conflicts