a1


Signed-off-by: b201524 <d201524@gmail.com>


Signed-off-by: b201524 <d201524@gmail.com>
Merge branch 'master' into a1

Conflicts:
	defUI.js
Merge branch 'a1' of https://github.com/b201524/defUI into a1

Conflicts:
	defUI.js
test1
test2
Merge branch 'a1'

Conflicts:
	defUI.js
asdf