Merge branch 'master' of github.com:shellster/metasploit-framework into shellster-master
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
Add dlink pass for #1648
Java payload bins

Compiled with the shiny new maven system
Land #1217, java payload build system refactor

[Closes #1217]
Use metasploit_data_models from rubygems
Merge pull request #1725 from bturner-r7/mdm_from_rubygems

Use metasploit_data_models from rubygems
Land #1660, dlink backdoor wordlist

[Closes #1660][See #1648]
android meterpreter