api upgrade for sdk
partialMerge branch 'master' of https://github.com/olaround/bootstrap-fishry

Conflicts:
	public/theme/views/header.ejs
	public/theme/views/header_resources.ejs
Merge branch 'master' of https://github.com/olaround/bootstrap-fishry
sd