update
add new Klan
add new Klan;
update Klan;
Merge branch 'master' of github.com:keuvy/Klan
Merge branch 'master' of github.com:keuvy/Klan

Conflicts:
	Klan/.classpath
	Klan/.project
	Klan/.target/controllers/Application.class
	Klan/.target/views/index.scala.html
	Klan/.target/views/main.scala.html
	Klan/app/controllers/Application.java
	Klan/app/views/index.scala.html
	Klan/app/views/main.scala.html
	Klan/conf/application.conf
	Klan/public/stylesheets/main.css
Klan update 30/04