controller get List<byte[]>
Merge branch 'master' of https://github.com/iforgetyou/helloorm

Conflicts:
	.idea/workspace.xml
	protocsrc/com/zy17/protobuf/domain/AddressBookProtos.java
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	war/WEB-INF/appengine-generated/local_db.bin