d
Merge branch 'master' of https://github.com/wing1000/test_sp

Conflicts:
	sprout/app/japidviews/Application/Search.java
	sprout/app/japidviews/Application/photo/UploadForm.java
	sprout/app/japidviews/_layouts/Layout.java
	sprout/app/japidviews/_tags/AddNav.java
	sprout/app/japidviews/_tags/CategoryMenus.java
	sprout/app/japidviews/_tags/CategorySelectOptions.java
	sprout/app/japidviews/_tags/PhotoNav.java
	sprout/app/japidviews/_tags/SettingsMenu.java
add license