Merge branch 'develop' of https://github.com/MPS-UPB/Unknown-Revengers into develop

Conflicts:
	src/LayoutParser.java
Merge branch 'develop' of https://github.com/MPS-UPB/Unknown-Revengers into develop
Merge branch 'develop' of https://github.com/MPS-UPB/Unknown-Revengers into develop
Merge branch 'develop' of https://github.com/MPS-UPB/Unknown-Revengers into develop
Creat un ComboBox care atunci cand e schimbat fie afiseaza imaginea de fundal cu selectoarele, fie afiseaza textbox-urile cu continutul acestora
Use JPanel instead of JScrollPane in GElement
Couple of text view fixes
1) Cand se schimba din Block in Line, se vor schimba TextArea-urile si in
tipul Text, nu doar in tipul Image
2) Cand se modifica textul in tipul Image, se va modifica automat si in
tipul Text
Scos codul comentat
Merge branch 'vizibilitate_imagine_text' of https://github.com/MPS-UPB/Unknown-Revengers into vizibilitate_imagine_text

Conflicts:
	src/gui/GElement.java
	src/gui/LayoutGUI.java
Change visibility.
Merge pull request #56 from MPS-UPB/vizibilitate_imagine_text

Vizibilitate imagine text