Fixing issue with repo not comiting to origin.
Added more static features and fixed bugs

Added more features like notification icons, context windows, etc...
Merge remote-tracking branch 'origin/Mockups' into Deploy_Staging
Merge branch 'Deploy_Staging' of https://github.com/FIU-SCIS-Senior-Project-2014-Fall/Test-Case into Deploy_Staging

Conflicts:
	code/mockup/app/index.html
	code/mockup/app/scripts/controllers/workspace.js
	code/mockup/app/theme/css/main.css
	code/mockup/app/views/main.html
	code/mockup/sass/sass/main.scss
fixing commit error
Added store location feature and fixed remove
Merge remote-tracking branch 'origin/Mockups' into Mockups

Conflicts:
	code/mockup/app/scripts/controllers/workspace.js
	code/mockup/app/views/workspace.html