Merge branch 'develop' into feature-documentation

.gitignore

.idea/.name

.idea/compiler.xml

.idea/dictionaries/warindrarto.xml

.idea/encodings.xml

.idea/inspectionProfiles/Project_Default.xml

.idea/inspectionProfiles/profiles_settings.xml

.idea/libraries/Maven__colt_colt_1_2_0.xml

...braries/Maven__com_google_code_cofoja_cofoja_1_0_r139.xml

.idea/libraries/Maven__com_google_code_gson_gson_2_2_2.xml

...aries/Maven__com_jamesmurty_utils_java_xmlbuilder_0_4.xml

.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml

.../Maven__commons_collections_commons_collections_3_2_1.xml

...ries/Maven__commons_httpclient_commons_httpclient_3_1.xml

.idea/libraries/Maven__commons_io_commons_io_2_1.xml

.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml

...ibraries/Maven__commons_logging_commons_logging_1_1_1.xml

.idea/libraries/Maven__concurrent_concurrent_1_3_4.xml

.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml

.idea/libraries/Maven__gov_nist_math_jama_1_0_2.xml