changes required in kaui for movement of invoice and account_timeline from killbill_helper to ruby client
reducing unnecessary changes and debugger statements
1)Payment Methods now can be searched using the new search api, 2) corrections done as per previous pull request recommendations
fix travis builds for jruby builds because of inconsistency in Gemfile.lock because of the 'if' condition for mysql gem
Merge branch 'master' of git://github.com/devaroop/killbill-admin-ui into devaroop-master
gemspec: update dependencies

Among updates, killbill-client has been bumped to 0.1.3.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
version: bump to 0.2.6

Add search capabilities and billing timeline filters.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Gemfile.lock: update kaui version

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Merge remote-tracking branch 'origin/master' into rbac

Conflicts:
	Gemfile.lock
	app/views/kaui/account_timelines/show.html.erb
	app/views/kaui/layouts/kaui_application.html.erb
	kaui.gemspec

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
cleanups: various UI bug fixes

* Use flash.now in renders to avoid keeping the message in the next request
* Switch from flash[:info] to flash[:notice] for consistency
* Fix redirect path error in CreditsController
* Add missing notice when destroying tag definitions
* Fix Multi-Tenancy/RBAC hack in killbill_helper
* Various small fixes: Kill Bill website url, placeholders, etc.
* Try to parse BillingExceptionJson in ErrorHelper (will be cleaner
  once we fully switch to the killbill client library)

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>