로그인 화면 추가
회원가입 1단계 완성
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/intermediates/dex-cache/cache.xml
	campusToday/build/generated/source/r/debug/com/frenztalk/campustoday/R.java
	campusToday/build/generated/source/r/debug/fr/castorflex/android/smoothprogressbar/R.java
	campusToday/build/generated/source/r/debug/uk/co/senab/actionbarpulltorefresh/library/R.java
	campusToday/build/intermediates/exploded-aar/CampusToday/main/unspecified/classes.jar
	campusToday/build/intermediates/exploded-aar/CampusToday/pulltorefresh/unspecified/classes.jar
	pulltorefresh/build/intermediates/exploded-aar/CampusToday/main/unspecified/classes.jar