refactoring, starting to build out API
Fetching collection data now
added featured apps api call
Fixed API calls to use promises, routing setup to go from app to app page
committing to develop
Merge branch 'dev' into develop

Conflicts:
	public/build/all.min.js
fixed server side routing issue
re-jiggered server to get around CORS issues for now
filtering out by desktop only apps
data feeding into singular app page
added temporary loading graphic
adding some templates + directives
done for now - need to implement server side stuff if CORS won't be enabled on their API servers.
reintegrated client side api
removed extraneous text input form login. Stubbed out temp marketplace auth for server
categories being brought in
1. Category listing now pulling into the home "page"(just need to add to template)
2. Setup a filter to filter out desktop apps.
3. Setup category page
General collection information if flowing in to main collection page. Shifted filters to their own folder and updated the grunt file
got search working
started to shift things back to using a mostly client-side api(not sure whats happening anymore but things are working), wired up basic category preview box as whiteboarded