activeadmin version >= 0.6
Merge branch 'master' of https://github.com/morr/activeadmin-axlsx

* 'master' of https://github.com/morr/activeadmin-axlsx:
  activeadmin version >= 0.6

Conflicts:
	activeadmin-axlsx.gemspec