rem eclipse dot files
updating git ignore
gitignore
Merge branch 'master' of https://github.com/IHTSDO/OTF-User-Module.git
adding git ignore to sec-web-example
Merge branch 'develop' of https://github.com/IHTSDO/OTF-User-Module

Conflicts:
	.gitignore
Merge branch 'develop' of https://github.com/IHTSDO/OTF-User-Module

Moving develop to head/master
Merge branch 'develop' of https://github.com/IHTSDO/OTF-User-Module

bringing the latest from develop
Merge branch 'develop' of https://github.com/IHTSDO/OTF-User-Module

pulling in new content from develop branch#
Merge branch 'develop' of https://github.com/IHTSDO/OTF-User-Module

Bringing in more content in the readme.txt
Merge branch 'develop' of https://github.com/IHTSDO/OTF-User-Module

Bringing in Example2.xml
Merge pull request #1 from IHTSDO/develop

Develop
Merge pull request #2 from IHTSDO/develop

changes due to sonar report
Merge pull request #3 from IHTSDO/develop

minor error fixed
Merge pull request #4 from IHTSDO/develop

Develop
Merge pull request #5 from IHTSDO/develop

Develop
Merge pull request #6 from IHTSDO/develop

minor fixes and documentation
Updates to skin pwd reset pages.
Merge pull request #7 from IHTSDO/rory-skinning

Updates to skin pwd reset pages.
Merge branch 'develop' and move to version 1.0.0

Conflicts:
	security-web/src/main/webapp/changePw.jsp
	security-web/src/main/webapp/css/cms.css
	security-web/src/main/webapp/css/content-modules.css
	security-web/src/main/webapp/css/core.css
	security-web/src/main/webapp/css/ieResponsive.css
	security-web/src/main/webapp/css/jquery-ui.css
	security-web/src/main/webapp/css/styles-default.css
	security-web/src/main/webapp/images/logo.png
	security-web/src/main/webapp/images/small_logo.png
	security-web/src/main/webapp/images/sprite_icons.png
	security-web/src/main/webapp/images/sprite_transparent_icons.png
	security-web/src/main/webapp/index-admin.jsp
	security-web/src/main/webapp/js/common.js
	security-web/src/main/webapp/js/core.js
	security-web/src/main/webapp/js/datepicker/css/datepicker.css
	security-web/src/main/webapp/js/datepicker/css/datepicker3.css
	security-web/src/main/webapp/js/datepicker/js/bootstrap-datepicker.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.ar.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.az.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.bg.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.ca.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.cs.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.cy.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.da.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.de.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.el.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.es.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.et.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.fa.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.fi.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.fr.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.gl.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.he.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.hr.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.hu.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.id.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.is.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.it.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.ja.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.ka.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.kk.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.kr.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.lt.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.lv.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.mk.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.ms.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.nb.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.nl-BE.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.nl.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.no.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.pl.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.pt-BR.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.pt.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.ro.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.rs-latin.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.rs.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.ru.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.sk.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.sl.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.sq.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.sv.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.sw.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.th.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.tr.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.ua.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.vi.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.zh-CN.js
	security-web/src/main/webapp/js/datepicker/js/locales/bootstrap-datepicker.zh-TW.js
	security-web/src/main/webapp/js/dialog.js
	security-web/src/main/webapp/js/jquery-ui.min.js
	security-web/src/main/webapp/js/jquery.validate.unobtrusive.js
	security-web/src/main/webapp/js/jqueryui/external/jquery/jquery.js
	security-web/src/main/webapp/js/jqueryui/images/ui-bg_flat_0_aaaaaa_40x100.png
	security-web/src/main/webapp/js/jqueryui/images/ui-bg_flat_75_ffffff_40x100.png
	security-web/src/main/webapp/js/jqueryui/images/ui-bg_glass_55_fbf9ee_1x400.png
	security-web/src/main/webapp/js/jqueryui/images/ui-bg_glass_65_ffffff_1x400.png
	security-web/src/main/webapp/js/jqueryui/images/ui-bg_glass_75_dadada_1x400.png
	security-web/src/main/webapp/js/jqueryui/images/ui-bg_glass_75_e6e6e6_1x400.png
	security-web/src/main/webapp/js/jqueryui/images/ui-bg_glass_95_fef1ec_1x400.png
	security-web/src/main/webapp/js/jqueryui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	security-web/src/main/webapp/js/jqueryui/images/ui-icons_222222_256x240.png
	security-web/src/main/webapp/js/jqueryui/images/ui-icons_2e83ff_256x240.png
	security-web/src/main/webapp/js/jqueryui/images/ui-icons_454545_256x240.png
	security-web/src/main/webapp/js/jqueryui/images/ui-icons_888888_256x240.png
	security-web/src/main/webapp/js/jqueryui/images/ui-icons_cd0a0a_256x240.png
	security-web/src/main/webapp/js/jqueryui/jquery-ui.css
	security-web/src/main/webapp/js/jqueryui/jquery-ui.js
	security-web/src/main/webapp/js/jqueryui/jquery-ui.min.css
	security-web/src/main/webapp/js/jqueryui/jquery-ui.min.js
	security-web/src/main/webapp/js/jqueryui/jquery-ui.structure.css
	security-web/src/main/webapp/js/jqueryui/jquery-ui.structure.min.css
	security-web/src/main/webapp/js/jqueryui/jquery-ui.theme.css
	security-web/src/main/webapp/js/jqueryui/jquery-ui.theme.min.css
	security-web/src/main/webapp/js/tinymce/langs/readme.md
	security-web/src/main/webapp/js/tinymce/license.txt
	security-web/src/main/webapp/js/tinymce/plugins/advlist/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/anchor/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/autolink/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/autoresize/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/autosave/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/bbcode/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/charmap/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/code/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/colorpicker/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/contextmenu/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/directionality/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-cool.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-cry.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-frown.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-innocent.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-kiss.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-laughing.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-sealed.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-smile.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-surprised.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-undecided.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-wink.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/img/smiley-yell.gif
	security-web/src/main/webapp/js/tinymce/plugins/emoticons/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/example/dialog.html
	security-web/src/main/webapp/js/tinymce/plugins/example/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/example_dependency/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/fullpage/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/fullscreen/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/hr/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/image/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/importcss/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/insertdatetime/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/layer/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/legacyoutput/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/link/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/lists/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/media/moxieplayer.swf
	security-web/src/main/webapp/js/tinymce/plugins/media/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/nonbreaking/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/noneditable/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/pagebreak/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/paste/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/preview/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/print/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/save/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/searchreplace/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/spellchecker/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/tabfocus/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/table/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/template/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/textcolor/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/textpattern/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/visualblocks/css/visualblocks.css
	security-web/src/main/webapp/js/tinymce/plugins/visualblocks/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/visualchars/plugin.min.js
	security-web/src/main/webapp/js/tinymce/plugins/wordcount/plugin.min.js
	security-web/src/main/webapp/js/tinymce/skins/lightgray/content.inline.min.css
	security-web/src/main/webapp/js/tinymce/skins/lightgray/content.min.css
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/readme.md
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce-small.dev.svg
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce-small.eot
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce-small.svg
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce-small.ttf
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce-small.woff
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce.dev.svg
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce.eot
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce.svg
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce.ttf
	security-web/src/main/webapp/js/tinymce/skins/lightgray/fonts/tinymce.woff
	security-web/src/main/webapp/js/tinymce/skins/lightgray/img/anchor.gif
	security-web/src/main/webapp/js/tinymce/skins/lightgray/img/loader.gif
	security-web/src/main/webapp/js/tinymce/skins/lightgray/img/object.gif
	security-web/src/main/webapp/js/tinymce/skins/lightgray/img/trans.gif
	security-web/src/main/webapp/js/tinymce/skins/lightgray/skin.ie7.min.css
	security-web/src/main/webapp/js/tinymce/skins/lightgray/skin.min.css
	security-web/src/main/webapp/js/tinymce/themes/modern/theme.min.js
	security-web/src/main/webapp/js/tinymce/tinymce.min.js
	security-web/src/main/webapp/login.jsp
	security-web/src/main/webapp/requestPwChange.jsp