Neue Strucktur, überflüssigen ordner entfehrnt
überflüssigen folder gelöscht
Merge branch 'origin/postgresql'

Conflicts:
	app/admin/admin_user.rb
	app/admin/comment.rb
	app/admin/dashboard.rb
	app/admin/note.rb
	app/assets/javascripts/active_admin.js.coffee
	app/assets/javascripts/login.js.coffee
	app/assets/javascripts/session.js.coffee
	app/assets/javascripts/session_controller.js.coffee
	app/assets/javascripts/welcome.js.coffee
	app/controllers/users/omniauth_callbacks_controller.rb
	app/models/admin_user.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_navbar.html.erb
	app/views/notes/show.html.erb
	config/database.yml
	config/initializers/active_admin.rb
	css_tmp/active_admin.css.scss
	css_tmp/amelia-bootswatch.css.scss
	css_tmp/yeti-bootswatch.css.scss
	db/migrate/20131112091247_create_users.rb
	db/migrate/20131114141522_devise_create_admin_users.rb
	db/migrate/20131114141524_create_active_admin_comments.rb
database und gemfile fix
delete css_tmp
erster bug fix auf branch master
bugfix zwei
bla bla
idex
Merge branch 'origin/postgresql'

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	app/views/notes/show.html.erb
	config/database.yml
	config/locales/de.yml