Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml

Author: phasenraum2010

src/main/java/org/woehlke/beachbox/entities/Vinyl.java

@@ -7,6 +7,7 @@
  * Created by Fert on 27.03.2014.
  */
 @Entity
+@Table(name="vinyl")
 public class Vinyl implements Serializable {
 
     @Id