owjeroiwjr
admin area to manage feed-urls
work-in-progress on submitting event dates
fix event submission to work with backend.
clean up event updating to submit event schedules seperately from the main
event, as they are separate objects in sTeam.
tempfile
Merge branch 'master' of github.com:Tech-Grind/ng-techgrind
restructuring some files
Merge branch 'master' of github.com:efraimip/ng-techgrind
fixing new profile structure
full js2cs conversion, excluding content & profile controllers (WIPs)
adding content_*.coffee files
removing tinymce and uploader *.coffee
UPDATE: setting up new template, cleaning libs, cleaning index
UPDATE: fontawesome 4.1.0
UPDATE: fontawesome 4.1.0 - adding css
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/css/font-awesome.css
	app/css/font-awesome.min.css
	app/index.html
	app/js/directives/tinymce.js
	app/lib/angular/ui-tinymce.js
	code_examples/app-js-directives/tinymce.js
	libs/jquery-1.10.2.min.zip
	package.json
	src/js/app.coffee
MERGING upstream/master