Moved assets to apropriate directories

Enables live SASS compilation in development & static serving in production
Added deploy to staging on push to develop in Travis
Merged Openshift Rails demo app for config settings
Merge pull request #11 from codeRIT/feature/sass

Move assets to appropriate directories, let rails compile SASS
Fixed Gemfile merge conflicts
Removed OpenShift index page
Merge pull request #17 from codeRIT/hotfix/gemfile

Fixed Gemfile merge conflicts
added Datto logo, updated FAQ
Merge pull request #18 from codeRIT/update/information

added Datto logo, updated FAQ
Merged Openshift Rails demo app for config settings
Resolved Gemfile.lock conflicts
Merging old hooks with new ones
Removed custom bundle dir commands
Fixed OpenShift gems & assets
Removed default OpenShift index.html
Fixed asset precompilation
Disabled example rails app deploy scripts
Re-enabled OpenShift database deployment script
Removed "force_clean_build" marker
Merge branch 'develop'

* develop:
  added Datto logo, updated FAQ
  Removed OpenShift index page
  Fixed Gemfile merge conflicts
  Merged Openshift Rails demo app for config settings
  Moved assets to apropriate directories

Conflicts:
	.openshift/action_hooks/deploy
	Gemfile.lock