add new portal as basises for testing theSkyMap
added faye support
add faye and ember
working with faye
working with faye
Merge branch 'master' into namespace_test

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	config/environments/production.rb
	config/environments/test.rb
	config/routes.rb
	db/structure.sql
Finish ember prototype
can load current user,
handle user authentication
push models to browsers using Faye
render and control and 3D grid map
render multiple views on a single page

Merge branch 'master' into namespace_test

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	config/environments/production.rb
	config/environments/test.rb
	config/routes.rb
	db/structure.sql
added support for csfr token to ember
added support for csfr token to ember
change name from sub to theSkyMap
added support for emblem to ember
Added quadrants and assicated models
Can now display and control the galaxy map
Adding ships to theSkyMap
Adding ships to theSkyMap
working on ships
work on actions
actions tentatively work without a gui atm
work on actions system
work on actions system
add capture action to ships
work on actions system