Merge branch 'master' of ssh://195.49.12.19/Users/git/AJUI_Button_comp

# Conflicts:
#	Project/DerivedData/methodAttributes.json

Author: minzirillo

.gitignore

@@ -0,0 +1,48 @@
+/HDI*
+/*.docx
+*.4darchive
+*BuildApp*
+*/Preferences/*
+Cache.xml
+Conversion*.json
+LogStyleSheet.xsl
+**/DerivedData/**
+!**/DerivedData/*.json
+data.match
+*Components-inactivate/*
+
+
+# 4D project architecture
+######################
+
+/Data/*
+/Logs/*
+/Project/DerivedData/*
+/Project/BuildSettings/*
+/Settings/*
+/userPreferences*/*
+/Builds/*
+
+# Don't need the data file, indexes, symbols, or journal
+*.4DD
+*.4DIndx
+*.4DIndy
+*symbols.txt
+*.journal
+*.match
+
+# dont need the 4d info component folder_reports
+Folder_Reports
+
+# include the following if you want to ignore the database settings
+*.4DSettings
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db