Merge remote-tracking branch 'thomasb/master'

Conflicts:
	app/assets/stylesheets/formtastic-changes.css.scss
	app/controllers/beispiele_controller.rb
	app/views/lvas/show.html.erb
	app/views/studien/_form.html.erb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb

app/assets/stylesheets/formtastic-changes.css.scss

@@ -5,8 +5,6 @@ form.formtastic textarea {
 width:90%;
 height:20em;
 }
-
-
 div.form-group {
 border-width: 1px;
 border-style: none;
@@ -17,4 +15,10 @@ div.verwalten-block {
 border-width: 1px;
 border-style: solid;
 padding: 5px;
-}
+}
+
+form.formtastic .input label.control-label {
+font-weight:bold;
+font-size:125%;
+}
+

app/assets/stylesheets/lvas.css.scss

@@ -1,3 +1,27 @@
 // Place all the styles related to the lvas controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+div.lva-semester {
+border: solid;
+border-width: 1px;
+margin: 1px;
+padding: 5px;
+border-color: green;
+border-radius: 5px;
+}
+div.lva-sidebar {
+border:solid;
+border-width: 1px;
+margin: 2px;
+padding:5px;
+border-radius:5px;
+}
+div.lva-beispiele {
+border:solid;
+border-width: 1px;
+margin: 2px;
+padding:5px;
+border-radius:5px;
+border-color: green;
+}

app/assets/stylesheets/studien.css.scss

@@ -1,3 +1,18 @@
 // Place all the styles related to the studia controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+div.verwalten-block {
+border-width: 1px;
+border-style: solid;
+padding: 5px;
+border-radius:10px;
+margin: 2px;
+}
+div.studien-semester {
+border-width: 1px;
+border-style: solid;
+padding: 5px;
+border-radius:10px;
+border-color: blue;
+margin: 2px;
+}