merging with server_api
Merge branch 'orm' of github.com:hall5714/Freedom-Galaxy into orm
adding blank __init__.py
service.py changes and README added
many changes
Merge branch 'orm'
Merge branch 'master' of github.com:hall5714/Freedom-Galaxy

Conflicts:
	fitg/backend/data/Freedom.db