Merge pull request #10 from Shinetechchina/liush-dev

Liush dev
fix bug - boxManager#load should remove old boxes first
Merge pull request #11 from Shinetechchina/david-dev

fix bug - boxManager#load should remove old boxes first
add blank box in all pages
re-align boxes
Active nav items when url changes
Merge branch 'master' into david-dev

Conflicts:
	app/assets/javascripts/application.coffee
finish css of slide