first commit
adopted zf2
merge
fixed conflicts