Merge branch 'dev' into ux
HOTFIX: Login js error fixed
Merge branch 'dev' into ux
Library Minify
Merge branch 'dev' into ux
Merge branch 'dev' into ux
Load Chat into the base layout
Merge branch 'dev' into ux
Merge remote-tracking branch 'origin/ux' into feature_post

Conflicts:
	Maple/models.py
RESTful API get data and example ajax
Merge remote-tracking branch 'origin/feature_post' into dev

Conflicts:
	Maple/models.py