Merge branch 'test-views-user' into master-test
Merge branch 'test-views' into master-test

Conflicts:
	TwitterClient/test/test/hk/ust/cse/TwitterClient/Mocks/MockURLEntity.java
	TwitterClient/test/test/hk/ust/cse/TwitterClient/Mocks/MockUser.java
Merge branch 'test-views-home' into master-test

Conflicts:
	TwitterClient/test/test/hk/ust/cse/TwitterClient/Mocks/MockUser.java
Merge branch 'test-controls-HomePageControl' into test-controls
Merge branch 'test-controls-TweetViewControl' into test-controls

Conflicts:
	TwitterClient/test/test/hk/ust/cse/TwitterClient/Mocks/MockResponseList.java
Merge branch 'test-controls-TwitterControl' into test-controls

Conflicts:
	TwitterClient/test/test/hk/ust/cse/TwitterClient/Mocks/MockUser.java
Merge branch 'test-controls-UserPageControl' into test-controls

Conflicts:
	TwitterClient/test/test/hk/ust/cse/TwitterClient/Mocks/MockResponseList.java
	TwitterClient/test/test/hk/ust/cse/TwitterClient/Mocks/MockUser.java
Merge branch 'test-controls' into master-test

Conflicts:
	TwitterClient/test/test/hk/ust/cse/TwitterClient/Mocks/MockUser.java