add
Merge branch 'haosun' of https://github.com/ludwiksh/Marksimos into haosun

Conflicts:
public/app/css/stylesheets/app.min.css
public/app/dist/app.min.js
public/app/js/appadmin.js
public/app/js/directivetemplates.js
add
Merge branch 'haosun' of https://github.com/ludwiksh/Marksimos into haosun

Conflicts:
	public/app/js/appadmin.js