Sammi 20141029
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/admin/api/api.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/app_index.html
Sammi 20141101
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/admin/api/api.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Sammi 20141101
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/lib/icon/fonts/untitled-font-1.eot
	static/lib/icon/fonts/untitled-font-1.svg
	static/lib/icon/fonts/untitled-font-1.ttf
	static/lib/icon/fonts/untitled-font-1.woff
	static/lib/icon/icons-reference.html
	static/lib/icon/styles.css
	templates/app_index.html
Sammi 20141101
Merge remote-tracking branch 'origin/master'