Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/ifashion/init_db.java
Merge remote-tracking branch 'origin/master'