patch:matrix
patch:matrix
dynamic xml
dynamic xml
dynamic xml
dynamic xml
menu
dynamic xml
assert

assert
Merge branch 'master' of https://github.com/mawanjin/FilmMuseum

Conflicts:
	AndroidManifest.xml
	assets/FilmMuseum.zip
	res/layout/menu_right.xml
	src/com/example/arthighlights/ArtHighlightsActivity.java
	src/com/example/arthighlights/AudioActivity.java
	src/com/example/eagerness/EagernessActivity.java
	src/com/example/filmmuseum/SukiActivity.java
	src/com/example/information/InformationActivity.java
	src/com/example/information/JoinActivity.java
	src/com/example/information/SupServicesActivity.java
	src/com/example/navigation/GlanceActivity.java
	src/com/example/navigation/NavigationActivity.java
	src/com/example/navigation/OptionalActivity.java
	src/com/example/navigation/RouteActivity.java
	src/com/example/screening/FutureScreeningActivity.java
	src/com/example/screening/NowScreeningActivity.java
	src/com/example/screening/ReviewScreeningActivity.java
	src/com/example/screening/ScreeningActivity.java
dynamic xml
download
download optimization