add TwoLayerCache
add TwoLayerCache
Merge branch 'refactor-foodpair' into impl-cache
cleanup
Merge branch 'impl-cache'

Conflicts:
	src/main/java/com/eucsoft/foodex/menu/Menu.java
	src/main/java/com/eucsoft/foodex/menu/ReportMenu.java
Merge branch 'impl-cache'

Conflicts:
	src/main/java/com/eucsoft/foodex/menu/Menu.java
	src/main/java/com/eucsoft/foodex/menu/ReportMenu.java
Merge branch 'fix-merge-error'
Fix NPE on devices without Flash Light
Merge branch 'fix-npe-on-flash'
Remove contains import from APITest class
Merge branch 'master' into auth-token-strategy