work on design continue
work on ajax
start work on trip bundle
work on trip bundle & user bundle
comments added & work on contact form
work on comments & profile
resolved conflicts
resolve conflicts
contact form & captcha
Merge pull request #2 from NovikovViktor/dev

Dev