update
Merge branch 'master' of https://github.com/tonysh518/ave_photowall

Conflicts:
	.idea/workspace.xml