Desktop framework
More desktop
Merge branch 'master' of https://github.com/mflorence99/pi-ware

Conflicts:
	public/d/config/gallery/routes.js
	public/d/load/blog/index.html
	public/d/load/gallery/index.html
	public/d/views/blog/sidebar/sidebar.js
	public/d/views/gallery/home/home.less
	public/d/views/gallery/sidebar/sidebar.html
	public/d/views/gallery/sidebar/sidebar.js
	public/d/views/main/bootstrap.less
	public/d/views/sidebar/sidebar.less
	public/x/config/gallery/attributes.js