merged
ignored files
Merge branch 'development'
fixed click event
Merge branch 'development'
fixed navigation
Merge branch 'development'
added
Merge branch 'development'
added registration