gradle
Merge branch 'master' into gradle
iml files
update aFileChooser to our local changes
first test
latest Gibberbot/Dataplug
initial provider
more provider
Merge branch 'master' into gradle

Conflicts:
	external/aFileChooser
new aFileChooser
Eclipse
Merge branch 'gradle'