no no no
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/static.class.php
Merge branch 'master' of github.com:junichino/FrameWork