edit comments form to work with ajax
add success event handler for comment form
Merge branch 'develop' into feature/ajax_comments
Merge branch 'master' into feature/ajax_comments
Merge branch 'develop' into feature/ajax_comments

Conflicts:
	app/views/web/posts/comments/_child_comment_form.html.haml
add parent_id to permitted parameters in api comments controller
add reply-to-comment class for reply button in comment partial
Merge branch 'develop' into feature/ajax_comments
Merge branch 'develop' into feature/ajax_top_comments
remove remote option from child comment form
Merge branch 'feature/ajax_top_comments' into develop
add ransack gem
add search form for web users#index
remove paging options
rename created_at to pretty_created_at for decorators
remove text_preview from post decorator
Merge branch 'release/1.3.1'
add search form for web posts#index
add translations for search forms
Merge branch 'feature/ransack' into develop

Conflicts:
	app/controllers/web/posts_controller.rb
	app/controllers/web/users_controller.rb
	app/views/web/posts/index.html.haml
	app/views/web/users/index.html.haml