added current landing page
fixed conflict
updated STAGELOG
wercker.yml