First push
Merge branch 'master' into GL

Conflicts:
	parentView/parentView.html
fix create bug and implement log in
Merge branch 'GL'